am 83b4047b: Merge "adbd & fastbootd: Support for new f_fs descriptor format"

* commit '83b4047bc66729f8cf854c525e2bc8bac7c9587e':
  adbd & fastbootd: Support for new f_fs descriptor format