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

Change-Id: I7180d073692bca1df2207c20fe3365565f988fcc