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

Change-Id: I7b51b1083ae666a4692b25993175f88fc489de60