Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 557ce055e7
am: 9a02b183fd

Change-Id: I6c03f945381c3fc10ac385357b2ae3ad26b657e4