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