am d0052bc7: (-s ours) am e6b3692b: am c17e0f92: Merge "Explicit record the modules\' built-file:installed-file"

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