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