Merge "AAPT2: Add --package-id flag for feature-split suppport"