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