Merge "access system resources with android.R package" am: ef77c1d67f am: 49cd1555f3

Change-Id: Idcb5041776ed072a871bc037df143450c92d458c