Android CTS 7.0 Release 31 (5450832)
Merge "Fix build with clang."