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

Change-Id: I52dc027af56abb60b27b3336fa30ceafaa93f04e