am 14273125: Merge "Tweak prelink map"

* commit '142731256afc708f4ec07247bffbe733dcaed0f4':
  Tweak prelink map