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

Change-Id: Id8e3da9c86583ab5f961fd70d6999038b54a72b9