Android CTS 7.0 Release 3 (3423912)
Merge "Fix build with clang."