Android CTS 7.1 Release 22 (5009338)
Merge "Fix build with clang."