Android CTS 7.0 Release 8 (3863512)
Merge "Fix build with clang."