Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6 am: 960584eeb0 am: f8a4fc97d6  -s ours
am: 2edf6d5579

Change-Id: I8216bf227bdf1b1def66479775415d487883b223