Some tweaks to allow building android projects.