Merge "Build adbd for recovery"
am: 6c9bb058c5

Change-Id: I54574b6c041b3f78dbc0ce094fb7bfab35a54df5