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