Revert recent r_submix patches
am: 16ad46ef48

Change-Id: I81847b326f175e1d9f8f8fe0a17774f2ae5e5a00