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

Change-Id: Ia9062da34ed335b204da4626748b930d8c2b594e