Android 7.1.2 release 18
Merge "Fix build with clang."