Android CTS 7.0 Release 13 (4305468)
Merge "Fix build with clang."