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