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

* commit '19ad9f3f9e544a2262881a1d35d233ecb36dc3a3':
  Fix order of operation issue with ResStringPool

Change-Id: I7b19b7162ec9b5df54f503056781e636345d6533