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