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

Change-Id: I54e05416b00cae815b5345c3a3b28e39ed4d6196