Remove deprecated command-line args

Some command-line args were deprecated in Diablo and slated for removal
in Folsom. They're being removed in Juno instead.

Change-Id: I02339ba08c997fecca5a6639382360962e668bfd
Merge "Remove deprecated command-line args"