am a66c5296: Merge "Don\'t allow "enable_root" in adb."

* commit 'a66c5296ea6f0e9f42d682cdea5fe05d587fd8d6':
  Don't allow "enable_root" in adb.