Android CTS 7.1 Release 3 (3764431)
Merge "Fix build with clang."