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