Merge branch 'merge-debugd-rewrite' into merge-debugd BUG=chromium:380202 Change-Id: I3557568f33cd9434ab7cbafe507e49bf250b55bf