backout fc98067f0aa4 (Bug 888548 part 3) for B2G build bustage
backout f607ac59de19 (Bug 888548 part 2) for B2G build bustage
backout 1e31542e117c (Bug 888548 part 1) for B2G build bustage on a CLOSED TREE