Merge "Increase heap size for fast capture in stereo"
am: bd20c630f0

Change-Id: Ia22053bc54ec4d6bff45159480390b616a9942ad