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

Change-Id: Ied38a0653016a252f42788c6c71c24c0475a21b1