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

Change-Id: Ia51ce69d9e51e0ea8164e47b09de8fd533ff3171