Merge "adbd: adb root should terminate adbd only if it's debuggable"