It blocks reenabling adb when "adb root" is executed. This reverts commit d9b18977. Change-Id: I7c2b87fa84baeed9b7a138edaa0b843ac303abfd