Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition." am: bde6ddbbfa  -s ours
am: eee645ec2a

Change-Id: I17d07f443e37de8d8144834ee1b5542877718e95