added AOSP music player/remove emulator targets