Backed out changeset 3947f817fc0a (bug 1102523) for breaking device b2g builds