Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2
am: aaf82799c7
am: 813d114d86
Change-Id: Ib341ab90b25d4763b695d929b1dbb2e2a4945e7d
This commit is contained in: