Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev