Android 8.1.0 release 30
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWxV1agAKCRDorT+BmrEO
ePtnAJ9LUe9eNjCH8IEXztUTqY2EoKVjpwCeOk0OTy9uxsZ2/saTo7IpKTH2w00=
=rwvM
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58