Merge "Move emulator specific configurations to vendor" am: 8930bf679b
am: 4d8e808a0b  -s ours

Change-Id: I8088efbae393871ebe02546c56f6cfea520e0681