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