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

Change-Id: I159c162a34246eca5196d5b41b7d7c46aa71c1ef