am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit '5e2e09c569092dcc19f9646060cc1c33266eb213':
  Tweak prelink map, more