Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev