Track own bionic

Change-Id: I86ce2f951fbaea121190a6723f71bf83b9250d98