[automerger skipped] [automerger] ResStringPool: Fix security vulnerability...

[automerger skipped] [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f2 am: 98e2d2ec am: 24a89da3 am: d85632ae am: 927b3357 am: 79d0fb25 am: a509e771 am: 80e36faa am: 76d71fa9 am: 86cfcaa6 am: 4f5e2340 am: 56046807  -s ours am: 19c4ef26  -s ours
am: 3ec1692a  -s ours

Change-Id: Ieabcffdd4bd5ea09941232f28be6d08532f4727e