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

Change-Id: I8bf6aa0dde3e2566b5ded95ab47cb2577024f1eb