Android CTS 7.0 Release 30 (5353406)
Merge "Fix build with clang."