Fix R.java issues.