Revert recent r_submix patches am: 16ad46ef48
am: 8579af332c

Change-Id: Ib6c41f5e47e5040887db781bc2c804d4663457a5