Android p preview 4
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWzJv4gAKCRDorT+BmrEO
eG2EAJ44fiPmJEz+SJJqj9sHtep9N0OQ6ACeIxOq8Di/bnjfwEBRpmVv1PziJzk=
=XKJM
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58