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