Backed out changeset 643354059afb (bug 874508) for b2g build bustage
CLOSED TREE