SQUASH into android packaging change