Android 7.1.2 release 9
Merge "Fix build with clang."