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