Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev