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