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

Change-Id: Ib892bc1f5e392d5dfce33e59b9d2796972828f23