Merge "AAPT support for feature splits" into lmp-dev