Merge "More progress towards split APKs in ASECs." into lmp-dev