Merge "Clean up copy & paste from frameworks/base/cmds."
am: d203a508ff

Change-Id: I80b97bf9fb01cf0e20614fb558cc1d20f8aec49d