Merge "Allowing the fs_mgr flag of avb_keys to be a dir" am: 9af7878ec5 am: f0b73557a3 am: 20a5cf1a6f

Change-Id: I33e7710f5fecaf8a06b4d0fe033dcb30348eb518