Merge "Improve rules of split apks." into lmp-dev