Android 7.1.0 release 7
Merge "Fix build with clang."