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