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

* commit 'cc7dccc815cfd6c29e934f038cd0a0b9d8f51a6a':
  Tweak prelink map even more