Merge "Build adbd for recovery" am: 6c9bb058c5 am: 5edce0ef5a
am: 107c97bf3c

Change-Id: I8ccce2baf4e7bcf952bcc2af3a946fa91233f172