Backed out changeset d87da7f7a3a9 (bug 693555) for android and b2g build bustage