Backed out changeset 64a320318bf9 (bug 1098082) for android build bustage