Merge "Do not rename R.java package"