Bug 836621 - Remote debugging (and hence ADB) should only be disabled for user builds

I also noticed that the --nnoftu takes no arguments, but wasn't setup that way when adding the options, so I fixed it (otherwise it was consumig the next argument)