Android CTS 7.1 Release 29 (5932587)
Merge "Fix build with clang."