Android 7.0.0 Release 33 (NBD92G)
Merge "Fix build with clang."