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

Change-Id: I471cae79973e6a0cb13d6c2b2c6eb5de1c23fd74