Merge "Make the emulator find the skins in their new location."