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