Android CTS 7.0 Release 16 (4438873)
Merge "Fix build with clang."