Fixed android build issues with res.