Android CTS 7.1 Release 23 (5054917)
Merge "Fix build with clang."