Revert "Handle adb sync with Bionic under /bionic" am: fc97d2a116
am: 8b9fa0a44d

Change-Id: Ic582b6217d99200105ef67e096bfe15411609811