Fixed android builds