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

Change-Id: I336963f7e70fb77522d8f478b8c0a831e938d9f1