Android 7.0.0 release 17
Merge "Fix build with clang."