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

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