Merge "Refactor the APEX package activation/deactivation logic in `otapreopt_chroot`." am: fafe4a0ec0
am: e3ef9446e4

Change-Id: Ia25d178436bc693766c4edc62771fd8f7614d297