Android CTS 7.0 Release 18 (4581285)
Merge "Fix build with clang."