Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a am: 19ad9f3f9e" into nyc-mr1-dev-plus-aosp