Bug 1234629 - Post: Make bouncer APK Java package org.mozilla.gecko, like the main APK. r=me

This small change is a follow-up to Bug 1242213, which did the same
for the main package.  This is a nod to the future and Gradle, which
cleanly splits the internal Java package (org.mozilla.gecko) from the
external Android package (org.mozilla.fennec and friends).

config/makefiles/java-build.mk

@@ -79,6 +79,7 @@ $(foreach extra_package,$(ANDROID_EXTRA_PACKAGES), \
 	@$(TOUCH) $@
 	$(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \
 		--custom-package $(ANDROID_APK_PACKAGE) \
+		--rename-manifest-package $(ANDROID_APK_PACKAGE) \
 		--non-constant-id \
 		--auto-add-overlay \
 		$(if $(ANDROID_EXTRA_PACKAGES),--extra-packages $(subst $(NULL) ,:,$(strip $(ANDROID_EXTRA_PACKAGES)))) \

mobile/android/bouncer/AndroidManifest.xml.in

@@ -1,7 +1,7 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="@ANDROID_PACKAGE_NAME@"
+      package="org.mozilla.gecko"
       android:installLocation="auto"
       android:versionCode="@ANDROID_VERSION_CODE@"
       android:versionName="@MOZ_APP_VERSION@"