Merge "Revert "Replace hardware features conf file to be emulator specific""