Merge "Add eraseblk and logicalblk fs_mgr flags" am: 68ab5b0589
am: d73ef4e6c8

Change-Id: Ia0d294bcacb85b37fe0c40b53b7be7fe59576dcf