Merge "Add LOCAL_LICENSE_KINDS to system/core/fs_mgr"