Android CTS 7.1 Release 19 (4844155)
Merge "Fix build with clang."