Merge "Have `otapreopt_chroot` mount APEX packages in the chroot dir."
am: 3a7044a102

Change-Id: I72a78c468030257d4d67098b91c33bb30ed37ad8