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

* commit '881daf4579a46dd373246f37f04c084b56da53d1':

Change-Id: I7c376b929487439ffa3e0a693e001c079cfba134