Merge "Make fs_mgr_access() available to user build" am: 8da39ef62a am: db8c37ef38
am: d72616bc44

Change-Id: I0486a3917b433d61ed0ef2203b625a635f44b030