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

* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
  Tweak prelink map even more