Android CTS 7.1 Release 27 (5450857)
Merge "Fix build with clang."