Android CTS 7.1 Release 16 (4660795)
Merge "Fix build with clang."