Merge "kernel: remove extra debugging specified on the command line" into cm-10.2