Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba am: 98b076b85d am: 1da72bfb6c am: 9bb6fa9e89

Change-Id: I128110df8aa4c7f0d9abd144be3f4078e6d87ad6