Android CTS 7.1 Release 10 (4372030)
Merge "Fix build with clang."