Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6
am: 960584eeb0

Change-Id: I98543758b3a7dfdca058fc1f8a61d31454f971e2