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

Change-Id: I102be11ee29872e201a88b7cf82d2d3824d7beb1