Don't bind-mount bionic files am: 7b4801a921
am: 2f2b99a20d

Change-Id: I060cec73225f039b23c4c1170bf8a7769a7c1ac6