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