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