Merge "Move emulator skins to development.git"