Merge "SnapdragonCamera:Fix recording audio leg"