Android CTS 7.0 Release 12 (4215243)
Merge "Fix build with clang."