am 1894085d: Merge "Tweak prelink map even more"

* commit '1894085d6e765878a928d901d1c91b16f9616d96':
  Tweak prelink map even more