Android CTS 7.1 Release 7 (4120758)
Merge "Fix build with clang."