Split out Android updates