Merge "fs_mgr_avb: introducing class VBMetaData" am: aed2ee9664
am: a76ec62f85

Change-Id: I7b85220e5e8a7c9f620fa5c22f62065a1492cd6a