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