Backed out changeset a10da316a35f (bug 1029341)
Backed out changeset 4f21e9bc729a (bug 1029364) for B2G Device and Emulator Bustage on a CLOSED TREE