Android CTS 9.0 Release 5 (5131725)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBANLAAKCRDorT+BmrEO
eCksAJ9Y7tl4toedWgL1QMgQ8bMorpFptACdEgUE1jxSBs6kdNoNVpEL2UjR9SM=
=FFwD
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58