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

* commit '19ad9f3f9e544a2262881a1d35d233ecb36dc3a3':

Change-Id: I1492ed196a8895ea83cda3f602543dfb8042e76d