am 6d94763b: am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."

* commit '6d94763b2fd88a66197927d3233eff91e2b8044a':
  Include ADB_HOST only code in #if ADB_HOST.