backout changeset 339049fcea42 (bug 1024809) for android and b2g bustage on a CLOSED TREE