-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXLDlKwAKCRDorT+BmrEO
eFmIAJ4652du+ysp0xqTowuovyVb3vzxgACfWNKjto6hfE//rSz/a6F1Cl0z/OY=
=58dC
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58