Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba

Change-Id: I4a15555cf1df7c81a4d4eea2c77ec0d71df5c44f