Merge "Revert "Have `otapreopt_chroot` bind-mount Bionic artifacts from the Runtime APEX."" am: 0472824d3e
am: f8ddfdbaab

Change-Id: Ia1d33392fa5b6eda70a5948de1a19865ead67240