am b6bddc2a: am 6ae71e50: am 506016a8: Merge "Make debug logging configurable via the logging setprop properties." into jb-mr1.1-dev

* commit 'b6bddc2aa5bb2cf093140e3b1dec6e387ecbc770':
  Make debug logging configurable via the logging setprop properties.