--- a/configs/merge_day/aurora_to_beta.py
+++ b/configs/merge_day/aurora_to_beta.py
@@ -1,16 +1,14 @@
 config = {
     "log_name": "aurora_to_beta",
 
     "branding_dirs": [
-        "mobile/android/config/mozconfigs/android/",
         "mobile/android/config/mozconfigs/android-api-11/",
         "mobile/android/config/mozconfigs/android-api-9-10-constrained/",
-        "mobile/android/config/mozconfigs/android-armv6/",
         "mobile/android/config/mozconfigs/android-x86/",
     ],
     "branding_files": ["debug", "l10n-nightly", "nightly"],
 
     # Disallow sharing, since we want pristine .hg directories.
     # "vcs_share_base": None,
     # "hg_share_base": None,
     "tools_repo_url": "https://hg.mozilla.org/build/tools",

--- a/configs/merge_day/central_to_aurora.py
+++ b/configs/merge_day/central_to_aurora.py
@@ -1,22 +1,22 @@
 config = {
     "log_name": "central_to_aurora",
 
     "branding_dirs": [
-        "mobile/android/config/mozconfigs/android/",
         "mobile/android/config/mozconfigs/android-api-11/",
         "mobile/android/config/mozconfigs/android-api-9-10-constrained/",
-        "mobile/android/config/mozconfigs/android-armv6/",
         "mobile/android/config/mozconfigs/android-x86/",
     ],
     "branding_files": ["debug", "l10n-nightly", "nightly"],
 
     "profiling_files": [
-        "mobile/android/config/mozconfigs/android/nightly",
+        "mobile/android/config/mozconfigs/android-api-11/nightly",
+        "mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly",
+        "mobile/android/config/mozconfigs/android-x86/nightly",
         "browser/config/mozconfigs/linux32/nightly",
         "browser/config/mozconfigs/linux64/nightly",
         "browser/config/mozconfigs/macosx-universal/nightly",
         "browser/config/mozconfigs/win32/nightly",
         "browser/config/mozconfigs/win64/nightly"
     ],
     "elf_hack_files": [
         # Not necessary since bug 788974 landed.
@@ -37,19 +37,19 @@ config = {
     "to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-aurora",
 
     "base_tag": "FIREFOX_AURORA_%(major_version)s_BASE",
     "end_tag": "FIREFOX_AURORA_%(major_version)s_END",
 
     "migration_behavior": "central_to_aurora",
 
     "balrog_rules_to_lock": [
-        8, # Fennec aurora channel
-        10, # Firefox aurora channel
-        18, # MetroFirefox aurora channel
+        8,  # Fennec aurora channel
+        10,  # Firefox aurora channel
+        18,  # MetroFirefox aurora channel
     ],
     "balrog_credentials_file": "oauth.txt",
 
     "virtualenv_modules": [
         "requests==2.2.1",
     ],
 
     "post_merge_builders": [