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

Change-Id: I9889465217c81308cc18b2ccae8a8580d013b780