am 86870f28: Merge "Use more robust method for enumerating built modules"

* commit '86870f284236e867e9ec624e07b54f81b2c61ea5':
  Use more robust method for enumerating built modules