Fix bug where we always add npo and nmo if they exist.

There are --npo and --nmo options. We should respect them.

BUG=None
TEST=Tested with both separately and at the same time.

Change-Id: Id75041ee10c32e42274955d9077c4521057fce61
Reviewed-on: https://gerrit.chromium.org/gerrit/40411
Commit-Queue: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
1 file changed