Add options on command-line.

R=fdoray@chromium.org, fw.centrale@gmail.com
BUG=

Review URL: https://codereview.appspot.com/14481043