Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev am: 61ac57283f
am: 312a3ff350

Change-Id: I956eefccec0613ed3b6caf0ec665c8079b6a41bf