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