Android 8.1.0 Release 29 (OPM4.171019.016.C1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWui7nQAKCRDorT+BmrEO
eIZnAJ4rRXgjdHcg1irlFw4Dc0lEfGvF6QCfU8cp4l2JM0bNHUInMWhc91PFm0I=
=HzZC
-----END PGP SIGNATURE-----
Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3 am: dd168c481d
am: 9533fad235

Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58