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

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

Change-Id: I00fdd69046f77fbc5d4c41476adc2d0a2073d56a