Tidy up the "extra debugging" knobs and their uses.

Change-Id: I6325501283e1a8d7af65ebbc8ba9e9562f78e526
Reviewed-on: https://code-review.googlesource.com/7403
Reviewed-by: Paul Wankadia <junyer@google.com>
5 files changed