Merge "fs_mgr: fix fs_mgr avb_keys parsing problem" am: c8964edb7e am: b9eca0256c
am: cad8a4fbe9

Change-Id: Ib6b224bb5768d7b327d89341b1e832f97bb83e46