Android 7.0.0 release 4
Merge "Fix build with clang."