Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 15314896f3
am: dd168c481d

Change-Id: I32933296c35d8251df0ca24c48ca7a05fa72cda1