Don't bind-mount bionic files am: 94b6c34aad am: 51cfca4723
am: 64579b14e5

Change-Id: Icb230f0fe9c3a9f00668a10aa7bbe42aedf13824