Backed out changeset 7a6008e82204 (bug 1040017) for B2G nonunified build failures