Merge "Replace hardware features conf file to be emulator specific"
am: afd7f4f453

Change-Id: I52b0bc325e8fb8d72e40d947cd7e683ab415d10c