Merge "fs_mgr: fix fs_mgr avb_keys parsing problem"