Merge "Do not rename R.java package" into rvc-dev