Use AOSP bionic for now

Change-Id: I9753a5d9e900fb6b6b5ad1077d7852a65527bf48