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

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

Change-Id: I6e78bfc1a3b3c61a03e51fca05dc94bd64b76560