Merge "ResStringPool: Fix security vulnerability" into pi-dev am: 135d82ac45
am: 097ba79da7

Change-Id: I078117c08fdc713a40a52b1f3b07504593cc3c69