am 65ce3270: am 1ff04118: Merge change 23693 into eclair

Merge commit '65ce32702d50f10dda6c50966a64b79985f8e7fd'

* commit '65ce32702d50f10dda6c50966a64b79985f8e7fd':
  dumpstate: Add option to output to socket, disable code that switched to nonroot