am fd64de9a: Merge prelink map tweaks

* commit 'fd64de9ae410b6bfe024971bd543d42286d2990f':
  Tweak prelink map