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

Merge commit 'c52c602171cb29c4a4c38005f321cf95d50d3418'

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