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

Change-Id: I30e73b60ae54cc4bf3461d484f1124bb448b25fc