Pick up additional android changes.