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

Change-Id: I8cbc7f2b6ea62b7760fbed1ca65bc2348afcc06e