am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '40dc95be7744871b5363ae2e21a14343cd666b0f':
  Tweak prelink map