Merge "Build .toc when building a module by name" am: 1b21a15049
am: af5b95ac90

* commit 'af5b95ac90ae06cf9efc52436e2e24d8c55541ce':
  Build .toc when building a module by name