More android buildfixin'