Merge "Move emulator specific configurations to vendor"
am: 8930bf679b

Change-Id: Ie2ebd2cf1ff97349d7858b3dd83751a4ec78f368