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

Change-Id: Ia5101dec489b088bef8e3e7c43e4fa64a8d0abc5