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