Merge "Revert "Replace hardware features conf file to be emulator specific"" am: 557ce055e7 am: 9a02b183fd
am: 4d353da971

Change-Id: I0aeb3ff1e5a8ef4a175c1ad1754bbb0f833d4c70