Android CTS 7.0 Release 28 (5165225)
Merge "Fix build with clang."