Merge "Increase heap size for fast capture in stereo" into oc-mr1-dev am: 9ea2cb3908
am: 8e9dad0cf9

Change-Id: Id82e063af84476a5b93dda6ce179a2737cdfb4ba