Merge "Replace hardware features conf file to be emulator specific" am: 25571a9496
am: 7762cee053

Change-Id: I9f534dda8e0fc540e0feaab38d98f5c18a959b2c