Back out 1ba9dc37c2ef:c6bc2193a72b (bug 877461) for b2g build bustage
CLOSED TREE