Merge "Copy adbd from system/bin to recovery/root/sbin" am: 6803a3444a am: 02a84c762d am: fa395903e5  -s ours
am: 726887c795  -s ours

Change-Id: Ieefebd9c53d8e42bdd818f0ee1b59935e24e2fbc