Merge "AAPT2: Implement density stripping and initial Split support" into nyc-dev