Android CTS 7.0 Release 23 (4844168)
Merge "Fix build with clang."