Android CTS 7.0 Release 6 (3670477)
Merge "Fix build with clang."