Android CTS 7.0 Release 22 (4800226)
Merge "Fix build with clang."