Switch to our bionic

Change-Id: I94cf8bf4b1c04ece7fba98c21f2eb0aa72cd1701