Switch to our bionic

Change-Id: I1fec5a39effb401721c4b68d2332e0342fa6f663