am 99918d02: Merge "Special-case "su --help"."

* commit '99918d024a0b361f48162599c968fb100e1dcc3e':
  Special-case "su --help".