Track our own bionic

Change-Id: I37bde3406fd82a174b935711e258521530807aba