Backed out 2 changesets (bug 1048108) for b2g build bustage

Backed out changeset dc8fac10012d (bug 1048108)
Backed out changeset 5da1e1c4c706 (bug 1048108)