Proper adb root, debuggable

Change-Id: I1aa6460f351797ddcb6feed88e6585b6adfbe019