Android CTS 7.0 Release 10 (4012877)
Merge "Fix build with clang."