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

Change-Id: Ifd2bf5985bfc0b62dd01fecf8ff4364651c7c311