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

Change-Id: I55e384b9b4dd0bf37a79cd272d4d83dde691b568