am 8e16a7e2: Merge "adb: add "adb unroot" to restart adb in non-root mode"

* commit '8e16a7e2a3506b6f526a503bd03e3919235dde71':
  adb: add "adb unroot" to restart adb in non-root mode