Merge "Copy adbd from system/bin to recovery/root/sbin"
am: 6803a3444a

Change-Id: Id28c6965e05ca828cc736621ddcfa14606753644