Merge "fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr"
am: c47618662f

Change-Id: Ic3daa609c300fc6fa009a2c5dfd417cc4462bfb4