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