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

Change-Id: I02856dffae5c204ac7de0ef86f61dbdfe010673d