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