am d9a2e548: Merge "Remove /dev/diag node on user builds."

* commit 'd9a2e548c49b5df12a46ea5edc37c27d505b143f':
  Remove /dev/diag node on user builds.