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

Change-Id: Ifb7af40f20ee05a034063c3c179282c301926344