Android CTS 8.1 Release 2 (4602824)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWoTGZgAKCRDorT+BmrEO
eC68AJ9GZSMMVErfXcS5t7uS+Lrd8MunDACcDJN2oS/DdDvP57jZ+4SE+fgcqyQ=
=m4hz
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58