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