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

Change-Id: I0be08a0e9eceff390626224e6643a6920f15c6fd