am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"

* commit 'e6b3692b8357b52b0a67e12be450e1ccfda5ffb5':
  Explicit record the modules' built-file:installed-file