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

* commit 'b53e8a7a8aa495289ab2872032f80501edd472ef':
  Fix order of operation issue with ResStringPool

Change-Id: Idaca4dee242389680b82b9d58728d281a65f9116