improved android build