am ac6a325e: (-s ours) am b02de7ed: am 05418442: Merge "Remove subproc events when ADB_HOST."

* commit 'ac6a325e5c2e2c852d4a5375743f17a29a372df9':