Android O Preview Release 1 (OPP1.170223.013)
Merge "Revert "Replace hardware features conf file to be emulator specific""