Android 7.1.1 release 10
Merge "Fix build with clang."