Merge "Mark out an mmodule API surface / add bi-dir deps"