Merge "su: fix the command line syntax." am: ec993d71cf am: 0d827f3e57
am: fd230bf39b

Change-Id: I4481dd39645276593b815f5481f45bb825b1491a