Merge "adbd: wait for FUNCTIONFS_BIND for up to a second, then retry." am: bfcb981b32
am: 80268fd592

Change-Id: I07a15442445e76d59cd1b6dff23ff5019eac0d45