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

Change-Id: Ic052d2fe6b251441eb2613704395cfa8947f80dd