Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2
am: 7178e1070b
am: 087f54d0e6
Change-Id: Id141a3dfea57f10f919fe2c24d3c0c5538816fe3
This commit is contained in: