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

Change-Id: Ie6e5c9078fc37296491d8469d99ca7d1b0d2fed4