Android CTS 7.1 Release 21 (4976769)
Merge "Fix build with clang."