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

Change-Id: I832b0b968f8dc4317892187e88bee99da5dd39eb