Android CTS 7.1 Release 25 (5240545)
Merge "Fix build with clang."