Restart adb when "adb root" is requested

Change-Id: I986f95c880cf0f90a06a1df516889587d9444046
Merge branch 'cm-10.1' into martincz