Fixed some android builder issues.