Merge "Fix aapt2 feature split package name generation" into sc-dev