Merge "Revert "Have `otapreopt_chroot` mount APEX packages in the chroot dir.""