copy from mobile/android/config/mozconfigs/android-api-15-gradle/nightly
copy to mobile/android/config/mozconfigs/android-api-15-gradle/artifact
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/artifact
@@ -1,23 +1,18 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_L10N_CHECK=0
+
+NO_CACHE=1
+NO_NDK=1
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-ac_add_options --enable-profiling
-
-# Android
-ac_add_options --with-android-min-sdk=15
-ac_add_options --target=arm-linux-androideabi
-
-ac_add_options --with-branding=mobile/android/branding/nightly
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-15-gradle/nightly"
 
-ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
-export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
-
-# From here on, just like ../android-api-15/nightly.
+unset CC
+unset CXX
+unset HOST_CC
+unset HOST_CXX
 
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling with eideticker. See bug 788680
-STRIP_FLAGS="--strip-debug"
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
+ac_add_options --enable-artifact-builds
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
@@ -1,23 +1,8 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-ac_add_options --enable-profiling
-
-# Android
-ac_add_options --with-android-min-sdk=15
-ac_add_options --target=arm-linux-androideabi
-
-ac_add_options --with-branding=mobile/android/branding/nightly
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
 
 ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
 export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
 
-# From here on, just like ../android-api-15/nightly.
-
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling with eideticker. See bug 788680
-STRIP_FLAGS="--strip-debug"
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

copy from mobile/android/config/mozconfigs/android-api-15-gradle/nightly
copy to mobile/android/config/mozconfigs/android-api-15/artifact
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/artifact
@@ -1,23 +1,18 @@
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_L10N_CHECK=0
+
+NO_CACHE=1
+NO_NDK=1
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-ac_add_options --enable-profiling
-
-# Android
-ac_add_options --with-android-min-sdk=15
-ac_add_options --target=arm-linux-androideabi
-
-ac_add_options --with-branding=mobile/android/branding/nightly
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
 
-ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
-export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
-
-# From here on, just like ../android-api-15/nightly.
+unset CC
+unset CXX
+unset HOST_CC
+unset HOST_CXX
 
-# This will overwrite the default of stripping everything and keep the symbol table.
-# This is useful for profiling with eideticker. See bug 788680
-STRIP_FLAGS="--strip-debug"
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
+ac_add_options --enable-artifact-builds
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

copy from testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15.py
copy to testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_artifact.py
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_artifact.py
@@ -1,8 +1,8 @@
 config = {
-    'base_name': 'Android armv7 API 15+ %(branch)s',
+    'base_name': 'Android armv7 API 15+ %(branch)s Artifact build',
     'stage_platform': 'android-api-15',
     'build_type': 'api-15-opt',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/nightly',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/artifact',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
 }

copy from testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
copy to testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_artifact.py
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_artifact.py
@@ -1,8 +1,8 @@
 config = {
-    'base_name': 'Android armv7 API 15+ %(branch)s Gradle',
+    'base_name': 'Android armv7 API 15+ %(branch)s Gradle Artifact build',
     'stage_platform': 'android-api-15-gradle',
     'build_type': 'api-15-gradle',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle/nightly',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle/artifact',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
 }