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

* commit 'baeb17e328e34bdb3d77f029824906e0a10e8454':

Change-Id: Ibbfec334724f83039853bc43ea9b25d9a53cc987