Merge "Remote submix: replace include path with module dependency" am: 9359ffb16b am: 5290206202
am: 4cd72e2e6c

Change-Id: I9afbed7360648ee6e49cd819a1f63f42e5e789e9