Merge "Increase heap size for fast capture in stereo" am: bd20c630f0 am: 09baf396d7
am: 1a470463c6

Change-Id: If10e606809015e2588e23df5f43d7acdee1345d7