Merge "Merge "Add AppCompatResources class" into nyc-dev am: 46242f5a1c am: fb247a4139" into nyc-mr1-dev-plus-aosp
am: 9982154969

* commit '9982154969783816af891c00afafd551c6e57524':

Change-Id: Ie66e06cf478168129179e6d79d50786388283cae