am 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks

* commit '9f2e07d2c2147572edb7170206ba7ece6d42fcb5':
  Tweak prelink map