am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
  Tweak prelink map, more