Merge "AAPT2: Share split functionality between link and optimize" into oc-dev