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