Backed out changeset 5d21dd9ca51e (bug 1018966) for b2g Build bustage
Backed out changeset 5adabc2818b2 (bug 1018966) for b2g bustage