--- a/mobile/android/b2gdroid/app/Makefile.in
+++ b/mobile/android/b2gdroid/app/Makefile.in
@@ -20,16 +20,22 @@ JAVAFILES := \
 # org.mozilla.gecko.R does not have the correct resource IDs for the consuming
 # application, so we skip it.  The b2gdroid APK builds a JAR containing
 # org.mozilla.gecko.R itself.
 jars_dir := $(DEPTH)/mobile/android/base
 ANDROID_EXTRA_JARS := $(filter-out %gecko-R.jar,$(wildcard $(jars_dir)/*.jar))
 # Needed for the UpdateService
 ANDROID_EXTRA_JARS += $(ANDROID_COMPAT_LIB)
 
+ANDROID_EXTRA_JARS += \
+	$(ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB) \
+	$(ANDROID_SUPPORT_V4_AAR_LIB) \
+	$(ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB) \
+	$(NULL)
+
 # The GeckoView consuming APK depends on the GeckoView resources.  This hacks a
 # type of poor man's AAR support.
 .aapt.deps: .geckoview_resources.deps
 
 .geckoview_resources.deps: $(DEPTH)/mobile/android/base/geckoview_resources.zip
 	@$(TOUCH) $@
 	$(UNZIP) -u -o $< -d $(CURDIR)/geckoview_resources
 

--- a/mobile/android/b2gdroid/app/moz.build
+++ b/mobile/android/b2gdroid/app/moz.build
@@ -20,11 +20,15 @@ ANDROID_ASSETS_DIRS += [
 # the GeckoView classes may reference resources provided by other packages.
 # That is, the GeckoView JAR files may reference android.support.v7.appcompat.R
 # (say) at runtime.  That class is in the gecko-R.jar file which is not (and can
 # not!) be included as part of GeckoView.  To avoid this, we'd need to include
 # the transitive set of resource classes.  For now, let's assume that b2gdroid
 # will not induce accesses to other package's resources at runtime.
 ANDROID_EXTRA_PACKAGES += ['org.mozilla.gecko']
 
+if CONFIG['ANDROID_SUPPORT_V4_AAR']:
+    ANDROID_EXTRA_PACKAGES += ['android.support.v4']
+    ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_SUPPORT_V4_AAR_RES']]
+
 JS_PREFERENCE_FILES += [
      'b2gdroid.js',
 ]