am 2feecf6f: am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"

* commit '2feecf6f379438c2e8ebc4c270ad9e4d62f6c37c':
  Tweak prelink map even more