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