Merge "Add initial stereo capture support for AAC encoder"