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

Change-Id: I36b45909ab6218a755e707f1a2867818c6e5cde8