Android o preview 2
Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 15314896f3

Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16