Android CTS 7.0 Release 19 (4606956)
Merge "Fix build with clang."