fix issues for android ci scripts