Add more fs management tools

Change-Id: Ia3167c98fac32cccf2b9500dacc2fc7695d7b8a4