Android CTS 7.0 Release 33 (5932566)
Merge "Fix build with clang."