Merge "Do not rename R.java package" am: 0941dd3d04

Change-Id: Ib047180cb4c70ce8f265e222a3f89aa0898eca0e