Merge "adbd: support ro.adb.nonblocking_ffs." am: affe351420
am: c94cec6d9d

Change-Id: Ifd92439c031bf0627740cd87e045b410b7bf19b8