Backed out changeset 6a3a0e3bfaf6 (bug 1054671) for B2G emulator build bustage on CLOSED TREE