Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev am: 356feb53b6
am: 789ffb45c5

Change-Id: I577bd1b6a7de0a81fbb5f23a0f31e3f5f5352d4b