Android CTS 7.1 Release 23 (5054917)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW+sfyAAKCRDorT+BmrEO
eBjZAJ0W9C05Mrtra/c0wiwvof1ynmHeSQCgil1DEAzu382jhe8ucJwny1vj0HU=
=Zc4t
-----END PGP SIGNATURE-----
Merge "Fix build with clang."