Android CTS 7.0 Release 17 (4486155)
Merge "Fix build with clang."