am efa16af5: am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"

* commit 'efa16af53ebc3ef4974ff791d0f03ec66b20a5e8':
  adbd: Support for new f_fs descriptor format