Merge "adbd: Support for new f_fs descriptor format"