Merge "AAPT2: Modified StringPool uniqueness detection #2" into pi-dev