am da61860d: (-s ours) DO NOT MERGE adb: Remove adbd from simulator build.

Merge commit 'da61860dda651ef160a66d2f6a24a8a1c9f055e0'

* commit 'da61860dda651ef160a66d2f6a24a8a1c9f055e0':
  DO NOT MERGE adb: Remove adbd from simulator build.