Merge "AAPT2: Reorder link steps"