Merge "r_submix: Fix compilation for non-default configurations" am: a5c2957f63 am: fcaa728e9e am: 0440eb8f00
am: 815f0f234d

Change-Id: I2856b1dba179825c21c29d05ea0b883baa51570e