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