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