Merge "Revert "Enable 4-channel input"" into mnc-dr-ryu-dev