Fixed android build issues.