Fixed android build failing on clean builds