Android 8.1.0 release 53
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXAVsfAAKCRDorT+BmrEO
eIJ2AJ46HcE6Q2QWa9VJ//5cQIQvkfBnsQCfbMBvL1EzpBQz3BR7JBEugSeWxGw=
=7Z8T
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58