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

Change-Id: I265f797d72e72f0e0b03d22627a05eff301b1df1