Backed out changeset 3b4e5b178aa6 (bug 1032125)
Backed out changeset f945fb33b616 (bug 1032125)
Backed out changeset 78b119af926a (bug 1032125) for bustage on B2g non-unified builds on a CLOSED TREE