Merge b2g-inbound to m-c. a=merge

2015-03-12 16:50:07 -04:00 · 2015-03-12 16:50:07 -04:00 · 5b806ff5b4
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@ -23,7 +23,7 @@
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@ -19,13 +19,13 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="97c3d9b8b87774ca7a08c89145e95b55652459ef"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
  <project name="platform_bionic" path="bionic" remote="b2g" revision="e2b3733ba3fa5e3f404e983d2e4142b1f6b1b846"/>
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@ -17,10 +17,10 @@
  </project>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
  <!-- Stock Android things -->
@ -135,7 +135,7 @@
  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="c5f8d282efe4a4e8b1e31a37300944e338e60e4f"/>
  <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9f28c4faea3b2f01db227b2467b08aeba96d9bec"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="95faf8d85851de4a87d351b424c8c2f3cde3aa5b"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="16836b56e16e89670b83735bda6d02c5608cc083"/>
  <project name="android-sdk" path="sdk" remote="b2g" revision="8b1365af38c9a653df97349ee53a3f5d64fd590a"/>
  <project name="darwinstreamingserver" path="system/darwinstreamingserver" remote="b2g" revision="cf85968c7f85e0ec36e72c87ceb4837a943b8af6"/>
 </manifest>
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@ -23,7 +23,7 @@
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@ -23,7 +23,7 @@
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="50d1ca4ab8add54523b7bc692860d57e8ee4c0d1"/>
  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="fb3845864573857677f9b500040a8f011eaf5078"/>
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@ -19,13 +19,13 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="97c3d9b8b87774ca7a08c89145e95b55652459ef"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
  <project name="platform_bionic" path="bionic" remote="b2g" revision="e2b3733ba3fa5e3f404e983d2e4142b1f6b1b846"/>
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@ -23,7 +23,7 @@
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
  <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
@ -146,7 +146,7 @@
  <project name="platform/hardware/ril" path="hardware/ril" revision="12b1977cc704b35f2e9db2bb423fa405348bc2f3"/>
  <project name="platform/system/bluetooth" path="system/bluetooth" revision="985bf15264d865fe7b9c5b45f61c451cbaafa43d"/>
  <project name="platform/system/core" path="system/core" revision="42839aedcf70bf6bc92a3b7ea4a5cc9bf9aef3f9"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="95faf8d85851de4a87d351b424c8c2f3cde3aa5b"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="16836b56e16e89670b83735bda6d02c5608cc083"/>
  <project name="platform/system/qcom" path="system/qcom" revision="63e3f6f176caad587d42bba4c16b66d953fb23c2"/>
  <project name="platform/vendor/qcom-opensource/wlan/prima" path="vendor/qcom/opensource/wlan/prima" revision="d8952a42771045fca73ec600e2b42a4c7129d723"/>
  <project name="platform/vendor/qcom/msm8610" path="device/qcom/msm8610" revision="4c187c1f3a0dffd8e51a961735474ea703535b99"/>
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@ -17,10 +17,10 @@
  </project>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
  <!-- Stock Android things -->
@ -145,7 +145,7 @@
  <project name="platform/hardware/ril" path="hardware/ril" revision="c4e2ac95907a5519a0e09f01a0d8e27fec101af0"/>
  <project name="platform/system/bluetooth" path="system/bluetooth" revision="e1eb226fa3ad3874ea7b63c56a9dc7012d7ff3c2"/>
  <project name="platform/system/core" path="system/core" revision="adc485d8755af6a61641d197de7cfef667722580"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="95faf8d85851de4a87d351b424c8c2f3cde3aa5b"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="16836b56e16e89670b83735bda6d02c5608cc083"/>
  <project name="platform/system/qcom" path="system/qcom" revision="1cdab258b15258b7f9657da70e6f06ebd5a2fc25"/>
  <project name="platform/vendor/qcom/msm8610" path="device/qcom/msm8610" revision="4ae5df252123591d5b941191790e7abed1bce5a4"/>
  <project name="platform/vendor/qcom-opensource/wlan/prima" path="vendor/qcom/opensource/wlan/prima" revision="ce18b47b4a4f93a581d672bbd5cb6d12fe796ca9"/>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@ -1,9 +1,9 @@
 {
    "git": {
-        "git_revision": "228f77fd32e5df0285b2e6ee6bd7a853c00e5b45", 
+        "git_revision": "eabe35cf054d47087b37c1ca7db8143717fbd7f3", 
        "remote": "https://git.mozilla.org/releases/gaia.git", 
        "branch": ""
    }, 
-    "revision": "8901bb90427eb8b3760235ff79252ccde745b137", 
+    "revision": "9139624122bb1343e99250a9643bca07f57579f7", 
    "repo_path": "integration/gaia-central"
 }
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@ -17,10 +17,10 @@
  </project>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
  <!-- Stock Android things -->
@ -130,7 +130,7 @@
  <project name="device-mako" path="device/lge/mako" remote="b2g" revision="78d17f0c117f0c66dd55ee8d5c5dde8ccc93ecba"/>
  <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="3a9a17613cc685aa232432566ad6cc607eab4ec1"/>
  <project name="device/lge/mako-kernel" path="device/lge/mako-kernel" revision="d1729e53d71d711c8fde25eab8728ff2b9b4df0e"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="95faf8d85851de4a87d351b424c8c2f3cde3aa5b"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="16836b56e16e89670b83735bda6d02c5608cc083"/>
  <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="7d33aaf740bbf6c7c6e9c34a92b371eda311b66b"/>
  <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
  <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="0e1929fa3aa38bf9d40e9e953d619fab8164c82e"/>
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="228f77fd32e5df0285b2e6ee6bd7a853c00e5b45"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="eabe35cf054d47087b37c1ca7db8143717fbd7f3"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="c82a532ee1f14b9733214022b1e2d55a0b030be8"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@ -23,7 +23,7 @@
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="ddf33f81e9a60f8110fcfd6b51b5dff2db676183"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="1a1e326a7804a62de8f61fab705f7e1974cad818"/>
  <!-- Stock Android things -->
  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="50d1ca4ab8add54523b7bc692860d57e8ee4c0d1"/>
  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="fb3845864573857677f9b500040a8f011eaf5078"/>
@ -141,7 +141,7 @@
  <default remote="caf" revision="refs/tags/android-5.0.0_r6" sync-j="4"/>
  <!-- Nexus 5 specific things -->
  <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="ba62cc8b78c30d36181b8060a2016cc8da166236"/>
-  <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="18113a7e02cad93e83363b860779f9f8375adf74"/>
+  <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="9be31ff74652fe3f835b8a5f5ae3e29e3156cbae"/>
  <project name="device/qcom/common" path="device/qcom/common" remote="caf" revision="3697e5acf25629b82658334e3f8ee3b6df5becab"/>
  <project name="device_lge_hammerhead-kernel" path="device/lge/hammerhead-kernel" remote="b2g" revision="1268f640184df5ef759ada669f101a613451673a"/>
  <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="0cb8574d338bf9f15b45ace7c08ad6deae9673ee"/>
@ -157,5 +157,5 @@
  <project name="platform/hardware/qcom/sensors" path="hardware/qcom/sensors" revision="3724fd91ef5183684d97e2bf1d7ff948faabe090"/>
  <project name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="2e54754cc0529d26ccac37ed291600048adbf6c0"/>
  <project name="platform/hardware/ril" path="hardware/ril" revision="71dfa8228ad0d6cdf6bac0426ac59404ab74b7f3"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="95faf8d85851de4a87d351b424c8c2f3cde3aa5b"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="16836b56e16e89670b83735bda6d02c5608cc083"/>
 </manifest>
--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
@ -120,11 +120,12 @@ AvStatusToSinkString(BluetoothA2dpConnectionState aState, nsAString& aString)
  }
 }

-class InitAvrcpResultHandler MOZ_FINAL : public BluetoothAvrcpResultHandler
+class BluetoothA2dpManager::InitAvrcpResultHandler MOZ_FINAL
+  : public BluetoothAvrcpResultHandler
 {
 public:
  InitAvrcpResultHandler(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  { }

  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -155,11 +156,12 @@ private:
  nsRefPtr<BluetoothProfileResultHandler> mRes;
 };

-class InitA2dpResultHandler MOZ_FINAL : public BluetoothA2dpResultHandler
+class BluetoothA2dpManager::InitA2dpResultHandler MOZ_FINAL
+  : public BluetoothA2dpResultHandler
 {
 public:
  InitA2dpResultHandler(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  { }

  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -193,13 +195,14 @@ private:
  nsRefPtr<BluetoothProfileResultHandler> mRes;
 };

-class OnErrorProfileResultHandlerRunnable MOZ_FINAL : public nsRunnable
+class BluetoothA2dpManager::OnErrorProfileResultHandlerRunnable MOZ_FINAL
+  : public nsRunnable
 {
 public:
  OnErrorProfileResultHandlerRunnable(BluetoothProfileResultHandler* aRes,
                                      nsresult aRv)
-  : mRes(aRes)
-  , mRv(aRv)
+    : mRes(aRes)
+    , mRv(aRv)
  {
    MOZ_ASSERT(mRes);
  }
@ -324,11 +327,12 @@ BluetoothA2dpManager::Get()
  return sBluetoothA2dpManager;
 }

-class CleanupAvrcpResultHandler MOZ_FINAL : public BluetoothAvrcpResultHandler
+class BluetoothA2dpManager::CleanupAvrcpResultHandler MOZ_FINAL
+  : public BluetoothAvrcpResultHandler
 {
 public:
  CleanupAvrcpResultHandler(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  { }

  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -363,11 +367,12 @@ private:
  nsRefPtr<BluetoothProfileResultHandler> mRes;
 };

-class CleanupA2dpResultHandler MOZ_FINAL : public BluetoothA2dpResultHandler
+class BluetoothA2dpManager::CleanupA2dpResultHandler MOZ_FINAL
+  : public BluetoothA2dpResultHandler
 {
 public:
  CleanupA2dpResultHandler(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  { }

  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -399,11 +404,12 @@ private:
  nsRefPtr<BluetoothProfileResultHandler> mRes;
 };

-class CleanupA2dpResultHandlerRunnable MOZ_FINAL : public nsRunnable
+class BluetoothA2dpManager::CleanupA2dpResultHandlerRunnable MOZ_FINAL
+  : public nsRunnable
 {
 public:
  CleanupA2dpResultHandlerRunnable(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  { }

  NS_IMETHOD Run() MOZ_OVERRIDE
@ -463,7 +469,8 @@ BluetoothA2dpManager::OnConnectError()
  mDeviceAddress.Truncate();
 }

-class ConnectResultHandler MOZ_FINAL : public BluetoothA2dpResultHandler
+class BluetoothA2dpManager::ConnectResultHandler MOZ_FINAL
+  : public BluetoothA2dpResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -514,7 +521,8 @@ BluetoothA2dpManager::OnDisconnectError()
  mController->NotifyCompletion(NS_LITERAL_STRING(ERR_DISCONNECTION_FAILED));
 }

-class DisconnectResultHandler MOZ_FINAL : public BluetoothA2dpResultHandler
+class BluetoothA2dpManager::DisconnectResultHandler MOZ_FINAL
+  : public BluetoothA2dpResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.h
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.h
@ -68,6 +68,15 @@ protected:
  virtual ~BluetoothA2dpManager();

 private:
+  class CleanupA2dpResultHandler;
+  class CleanupA2dpResultHandlerRunnable;
+  class CleanupAvrcpResultHandler;
+  class ConnectResultHandler;
+  class DisconnectResultHandler;
+  class InitA2dpResultHandler;
+  class InitAvrcpResultHandler;
+  class OnErrorProfileResultHandlerRunnable;
+
  BluetoothA2dpManager();
  void ResetA2dp();
  void ResetAvrcp();
--- a/dom/bluetooth/bluedroid/BluetoothOppManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothOppManager.cpp
@ -59,7 +59,10 @@ StaticRefPtr<BluetoothOppManager> sBluetoothOppManager;
 static bool sInShutdown = false;
 }

-class mozilla::dom::bluetooth::SendFileBatch {
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothOppManager::SendFileBatch MOZ_FINAL
+{
 public:
  SendFileBatch(const nsAString& aDeviceAddress, nsIDOMBlob* aBlob)
    : mDeviceAddress(aDeviceAddress)
@ -80,7 +83,7 @@ BluetoothOppManager::Observe(nsISupports* aSubject,
  // if state of any volume was changed
  if (!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
    HandleVolumeStateChanged(aSubject);
-    return NS_OK; 
+    return NS_OK;
  }

  if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
@ -92,7 +95,7 @@ BluetoothOppManager::Observe(nsISupports* aSubject,
  return NS_ERROR_UNEXPECTED;
 }

-class SendSocketDataTask : public nsRunnable
+class BluetoothOppManager::SendSocketDataTask MOZ_FINAL : public nsRunnable
 {
 public:
  SendSocketDataTask(uint8_t* aStream, uint32_t aSize)
@ -116,7 +119,7 @@ private:
  uint32_t mSize;
 };

-class ReadFileTask : public nsRunnable
+class BluetoothOppManager::ReadFileTask MOZ_FINAL : public nsRunnable
 {
 public:
  ReadFileTask(nsIInputStream* aInputStream,
@ -161,7 +164,7 @@ private:
  uint32_t mAvailablePacketSize;
 };

-class CloseSocketTask : public Task
+class BluetoothOppManager::CloseSocketTask MOZ_FINAL : public Task
 {
 public:
  CloseSocketTask(BluetoothSocket* aSocket) : mSocket(aSocket)
@ -1605,3 +1608,5 @@ BluetoothOppManager::Reset()
 {
  MOZ_ASSERT(false);
 }
+
+END_BLUETOOTH_NAMESPACE
--- a/dom/bluetooth/bluedroid/BluetoothOppManager.h
+++ b/dom/bluetooth/bluedroid/BluetoothOppManager.h
@ -29,11 +29,15 @@ BEGIN_BLUETOOTH_NAMESPACE

 class BluetoothSocket;
 class ObexHeaderSet;
-class SendFileBatch;

 class BluetoothOppManager : public BluetoothSocketObserver
                          , public BluetoothProfileManagerBase
 {
+  class CloseSocketTask;
+  class ReadFileTask;
+  class SendFileBatch;
+  class SendSocketDataTask;
+
 public:
  BT_DECL_PROFILE_MGR_BASE
  virtual void GetName(nsACString& aName)
--- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
@ -273,13 +273,14 @@ BluetoothHfpManager::Init()
  return true;
 }

-class CleanupInitResultHandler MOZ_FINAL : public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::CleanupInitResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  CleanupInitResultHandler(BluetoothHandsfreeInterface* aInterface,
                           BluetoothProfileResultHandler* aRes)
-  : mInterface(aInterface)
-  , mRes(aRes)
+    : mInterface(aInterface)
+    , mRes(aRes)
  {
    MOZ_ASSERT(mInterface);
  }
@ -322,11 +323,12 @@ private:
  nsRefPtr<BluetoothProfileResultHandler> mRes;
 };

-class InitResultHandlerRunnable MOZ_FINAL : public nsRunnable
+class BluetoothHfpManager::InitResultHandlerRunnable MOZ_FINAL
+  : public nsRunnable
 {
 public:
  InitResultHandlerRunnable(CleanupInitResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  {
    MOZ_ASSERT(mRes);
  }
@ -341,13 +343,14 @@ private:
  nsRefPtr<CleanupInitResultHandler> mRes;
 };

-class OnErrorProfileResultHandlerRunnable MOZ_FINAL : public nsRunnable
+class BluetoothHfpManager::OnErrorProfileResultHandlerRunnable MOZ_FINAL
+  : public nsRunnable
 {
 public:
  OnErrorProfileResultHandlerRunnable(BluetoothProfileResultHandler* aRes,
                                      nsresult aRv)
-  : mRes(aRes)
-  , mRv(aRv)
+    : mRes(aRes)
+    , mRv(aRv)
  {
    MOZ_ASSERT(mRes);
  }
@ -426,11 +429,12 @@ BluetoothHfpManager::~BluetoothHfpManager()
  hal::UnregisterBatteryObserver(this);
 }

-class CleanupResultHandler MOZ_FINAL : public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::CleanupResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  CleanupResultHandler(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  { }

  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -456,11 +460,12 @@ private:
  nsRefPtr<BluetoothProfileResultHandler> mRes;
 };

-class DeinitResultHandlerRunnable MOZ_FINAL : public nsRunnable
+class BluetoothHfpManager::DeinitResultHandlerRunnable MOZ_FINAL
+  : public nsRunnable
 {
 public:
  DeinitResultHandlerRunnable(BluetoothProfileResultHandler* aRes)
-  : mRes(aRes)
+    : mRes(aRes)
  {
    MOZ_ASSERT(mRes);
  }
@ -606,8 +611,8 @@ BluetoothHfpManager::NotifyDialer(const nsAString& aCommand)
  BT_ENSURE_TRUE_VOID_BROADCAST_SYSMSG(type, parameters);
 }

-class VolumeControlResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::VolumeControlResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -743,8 +748,8 @@ BluetoothHfpManager::HandleShutdown()
  sBluetoothHfpManager = nullptr;
 }

-class ClccResponseResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::ClccResponseResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -780,8 +785,8 @@ BluetoothHfpManager::SendCLCC(Call& aCall, int aIndex)
    aCall.mType, mDeviceAddress, new ClccResponseResultHandler());
 }

-class FormattedAtResponseResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::FormattedAtResponseResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -800,8 +805,8 @@ BluetoothHfpManager::SendLine(const char* aMessage)
    aMessage, mDeviceAddress, new FormattedAtResponseResultHandler());
 }

-class AtResponseResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::AtResponseResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -820,8 +825,8 @@ BluetoothHfpManager::SendResponse(BluetoothHandsfreeAtResponse aResponseCode)
    aResponseCode, 0, mDeviceAddress, new AtResponseResultHandler());
 }

-class PhoneStateChangeResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::PhoneStateChangeResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -852,8 +857,8 @@ BluetoothHfpManager::UpdatePhoneCIND(uint32_t aCallIndex)
    new PhoneStateChangeResultHandler());
 }

-class DeviceStatusNotificationResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::DeviceStatusNotificationResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -1108,8 +1113,8 @@ BluetoothHfpManager::ToggleCalls()
                             nsITelephonyService::CALL_STATE_CONNECTED;
 }

-class ConnectAudioResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::ConnectAudioResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -1134,8 +1139,8 @@ BluetoothHfpManager::ConnectSco()
  return true;
 }

-class DisconnectAudioResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::DisconnectAudioResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -1180,11 +1185,12 @@ BluetoothHfpManager::OnConnectError()
  mDeviceAddress.Truncate();
 }

-class ConnectResultHandler MOZ_FINAL : public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::ConnectResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  ConnectResultHandler(BluetoothHfpManager* aHfpManager)
-  : mHfpManager(aHfpManager)
+    : mHfpManager(aHfpManager)
  {
    MOZ_ASSERT(mHfpManager);
  }
@ -1233,11 +1239,12 @@ BluetoothHfpManager::OnDisconnectError()
  mController->NotifyCompletion(NS_LITERAL_STRING(ERR_CONNECTION_FAILED));
 }

-class DisconnectResultHandler MOZ_FINAL : public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::DisconnectResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  DisconnectResultHandler(BluetoothHfpManager* aHfpManager)
-  : mHfpManager(aHfpManager)
+    : mHfpManager(aHfpManager)
  {
    MOZ_ASSERT(mHfpManager);
  }
@ -1510,8 +1517,8 @@ BluetoothHfpManager::CnumNotification(const nsAString& aBdAddress)
  SendResponse(HFP_AT_RESPONSE_OK);
 }

-class CindResponseResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::CindResponseResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@ -1540,8 +1547,8 @@ BluetoothHfpManager::CindNotification(const nsAString& aBdAddress)
    new CindResponseResultHandler());
 }

-class CopsResponseResultHandler MOZ_FINAL
-: public BluetoothHandsfreeResultHandler
+class BluetoothHfpManager::CopsResponseResultHandler MOZ_FINAL
+  : public BluetoothHandsfreeResultHandler
 {
 public:
  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
--- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
+++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
@ -141,11 +141,28 @@ protected:
  virtual ~BluetoothHfpManager();

 private:
-  class GetVolumeTask;
-  class CloseScoTask;
+  class AtResponseResultHandler;
+  class CindResponseResultHandler;
+  class ConnectAudioResultHandler;
+  class ConnectResultHandler;
+  class CopsResponseResultHandler;
+  class ClccResponseResultHandler;
+  class CleanupInitResultHandler;
+  class CleanupResultHandler;
  class CloseScoRunnable;
-  class RespondToBLDNTask;
+  class CloseScoTask;
+  class DeinitResultHandlerRunnable;
+  class DeviceStatusNotificationResultHandler;
+  class DisconnectAudioResultHandler;
+  class DisconnectResultHandler;
+  class FormattedAtResponseResultHandler;
+  class GetVolumeTask;
+  class InitResultHandlerRunnable;
  class MainThreadTask;
+  class OnErrorProfileResultHandlerRunnable;
+  class PhoneStateChangeResultHandler;
+  class RespondToBLDNTask;
+  class VolumeControlResultHandler;

  friend class BluetoothHfpManagerObserver;
  friend class GetVolumeTask;
--- a/testing/docker/phone-builder/Dockerfile
+++ b/testing/docker/phone-builder/Dockerfile
@ -1,4 +1,4 @@
-FROM          quay.io/mozilla/builder:0.2.6
+FROM          quay.io/mozilla/builder:0.5.0
 MAINTAINER    Wander Lairson Costa <wcosta@mozilla.com>

 # Add utilities and configuration
@ -9,5 +9,5 @@ ADD           system-setup.sh       /tmp/system-setup.sh
 RUN           /tmp/system-setup.sh

 # Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]
+ENTRYPOINT ["validate_task.py"]

--- a/testing/docker/phone-builder/VERSION
+++ b/testing/docker/phone-builder/VERSION
@ -1 +1 @@
-0.0.8
+0.0.9
--- a/testing/docker/phone-builder/bin/validate_task.py
+++ b/testing/docker/phone-builder/bin/validate_task.py
@ -7,6 +7,7 @@ import json
 import urllib2
 import sys
 import re
+import subprocess

 repo_matcher = re.compile(r'[a-z]+://(hg|git)\.mozilla\.org')

@ -49,11 +50,17 @@ def main():
    taskid = os.getenv('TASK_ID')

    # If the task id is None, we assume we are running docker locally
-    if taskid is None:
-        sys.exit(0)
+    if taskid is not None:
+        task = get_task(taskid)
+        ret = check_task(task)
+        if ret != 0:
+            sys.exit(ret)

-    task = get_task(taskid)
-    sys.exit(check_task(task))
+    if len(sys.argv) > 1:
+        try:
+            subprocess.call(sys.argv[1:], shell=True)
+        except subprocess.CalledProcessError as e:
+            sys.exit(e.returncode)

 if __name__ == '__main__':
    main()
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@ -196,7 +196,7 @@ class Graph(object):
        default=os.environ.get('GECKO_BASE_REPOSITORY'),
        help='URL for "base" repository to clone')
    @CommandArgument('--mozharness-repository',
-        default='https://github.com/lightsofapollo/build-mozharness',
+        default='https://hg.mozilla.org/build/mozharness',
        help='URL for custom mozharness repo')
    @CommandArgument('--head-repository',
        default=os.environ.get('GECKO_HEAD_REPOSITORY'),
--- a/testing/taskcluster/scripts/phone-builder/build-phone.sh
+++ b/testing/taskcluster/scripts/phone-builder/build-phone.sh
@ -1,6 +1,13 @@
 #! /bin/bash -vex

+# Ensure all the scripts in this dir are on the path....
+DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+PATH=$DIRNAME:$PATH
+
+WORKSPACE=$1
+
 ### Check that require variables are defined
+test -d $WORKSPACE
 test $GECKO_HEAD_REPOSITORY # Should be an hg repository url to pull from
 test $GECKO_BASE_REPOSITORY # Should be an hg repository url to clone from
 test $GECKO_HEAD_REV # Should be an hg revision to pull down
@ -9,10 +16,7 @@ test $MOZHARNESS_REV # mozharness revision
 test $TARGET
 test $VARIANT

-if ! validate_task.py; then
-    echo "Not a valid task" >&2
-    exit 1
-fi
+. ../builder/setup-ccache.sh

 # First check if the mozharness directory is available. This is intended to be
 # used locally in development to test mozharness changes:
@ -23,15 +27,13 @@ if [ ! -d mozharness ]; then
  tc-vcs checkout mozharness $MOZHARNESS_REPOSITORY $MOZHARNESS_REPOSITORY $MOZHARNESS_REV
 fi

-OBJDIR="$HOME/object-folder"
-
-if [ ! -d $OBJDIR ]; then
-  mkdir -p $OBJDIR
-fi
-
 # Figure out where the remote manifest is so we can use caches for it.
 MANIFEST=$(repository-url.py $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV b2g/config/$TARGET/sources.xml)
-tc-vcs repo-checkout $OBJDIR/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
+tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
+
+# Ensure symlink has been created to gecko...
+rm -f $WORKSPACE/B2G/gecko
+ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko

 debug_flag=""
 if [ 0$B2G_DEBUG -ne 0 ]; then
@ -42,7 +44,7 @@ backup_file=$(aws --output=text s3 ls s3://b2g-phone-backups/$TARGET/ | tail -1

 if echo $backup_file | grep '\.tar\.bz2'; then
    aws s3 cp s3://b2g-phone-backups/$TARGET/$backup_file .
-    tar -xjf $backup_file -C $OBJDIR/B2G
+    tar -xjf $backup_file -C $WORKSPACE/B2G
    rm -f $backup_file
 fi

@ -51,7 +53,7 @@ fi
  "$debug_flag" \
  --disable-mock \
  --variant=$VARIANT \
-  --work-dir=$OBJDIR/B2G \
+  --work-dir=$WORKSPACE/B2G \
  --gaia-languages-file locales/languages_all.json \
  --log-level=debug \
  --target=$TARGET \
@ -61,13 +63,15 @@ fi
  --repo=$GECKO_HEAD_REPOSITORY

 # Don't cache backups
-rm -rf $OBJDIR/B2G/backup-*
+rm -rf $WORKSPACE/B2G/backup-*

 # Move files into artifact locations!
 mkdir -p artifacts

-mv $OBJDIR/B2G/upload/sources.xml artifacts/sources.xml
-mv $OBJDIR/B2G/upload/b2g-*.crashreporter-symbols.zip artifacts/b2g-crashreporter-symbols.zip
-mv $OBJDIR/B2G/upload/b2g-*.android-arm.tar.gz artifacts/b2g-android-arm.tar.gz
-mv $OBJDIR/B2G/upload/${TARGET}.zip artifacts/${TARGET}.zip
-mv $OBJDIR/B2G/upload/gaia.zip artifacts/gaia.zip
+mv $WORKSPACE/B2G/upload/sources.xml artifacts/sources.xml
+mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip artifacts/b2g-crashreporter-symbols.zip
+mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz artifacts/b2g-android-arm.tar.gz
+mv $WORKSPACE/B2G/upload/${TARGET}.zip artifacts/${TARGET}.zip
+mv $WORKSPACE/B2G/upload/gaia.zip artifacts/gaia.zip
+
+ccache -s
--- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
@ -0,0 +1,35 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/job_flags.yml
+
+$inherits:
+  from: tasks/branches/mozilla-central/job_flags.yml
+
+builds:
+  flame-kk:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_opt.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
+
+tests:
+  gaia-build:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_opt.yml:
+        task: tasks/tests/b2g_build_test.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/b2g_build_test.yml
+  gaia-linter:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_opt.yml:
+        task: tasks/tests/b2g_linter.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/b2g_linter.yml
+
--- a/testing/taskcluster/tasks/branches/cypress/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/cypress/job_flags.yml
@ -3,7 +3,7 @@
 # see <gecko>/testing/taskcluster/tasks/job_flags.yml

 $inherits:
-  from: tasks/branches/base_job_flags.yml
+  from: tasks/branches/mozilla-central/job_flags.yml

 builds:
  flame-kk:
--- a/testing/taskcluster/tasks/builds/b2g_phone_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
@ -13,8 +13,10 @@ task:
    maxRunTime: 14400

    command:
-      - with_workspace
-      - build-phone.sh
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-phone.sh $HOME/workspace

  extra:
    # Rather then enforcing particular conventions we require that all build
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@ -406,7 +406,6 @@ package-tests: \
  stage-marionette \
  stage-cppunittests \
  stage-jittest \
-  stage-steeplechase \
  stage-web-platform-tests \
  $(NULL)
 else
@ -434,6 +433,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 package-tests: stage-b2g
 endif

+ifdef MOZ_WEBRTC
+package-tests: stage-steeplechase
+endif
+
 make-stage-dir:
 	rm -rf $(PKG_STAGE)
 	$(NSINSTALL) -D $(PKG_STAGE)
 @ -1 +1 @@
 .0.8
 .0.9