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

Change-Id: I9c2cbfc2f2a62d29c3a91dc2b48ebd25801f46a4