Merge "Revert "Have `otapreopt_chroot` mount APEX packages in the chroot dir."" am: ba7cb3de53 am: e10b5c6a14
am: a56a9ccb6f

Change-Id: Icf0bb0f4b2b9d413c1dc2c0e95e3227541473986