Android CTS 7.1 Release 14 (4581283)
Merge "Fix build with clang."