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