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

Change-Id: Idb6510db9eb8cbacda99a6117e5a7302a4cf1637