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

Change-Id: I6b1700d817417573a8296806b549e5b95dc7479a