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

Change-Id: Ia4a29eedde07ea29b0a7650179330386ecf19af1