fix android build bugs