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

Change-Id: Ifa3ecb1b911be2a80c197c9636fa9b8125ed86cd