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

Change-Id: I55054b4ac480d734a22804506d09cf13fd042ca5