Merge "AAPT2: Expose split support to command line"