Fixed AndroidRekey migration