Merge "get-prebuilts: Add overwrite flag to prevent prompt when files exist" into ics
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 1b6472e..a7f758d 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -3,7 +3,6 @@
 
 # Bring in all audio files
 include frameworks/base/data/sounds/AllAudio.mk
-include frameworks/base/data/sounds/AudioPackage7.mk
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 95129ef..fcd2e83 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -78,6 +78,7 @@
 app/GoogleQuickSearchBox.apk
 app/GoogleLoginService.apk
 app/Talk.apk
+app/Maps.apk
 app/DeskClockGoogle.apk app/DeskClock.apk
 app/GooglePackageVerifier.apk
 app/NfcGoogle.apk app/Nfc.apk