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

* commit '27c9c6f6fea63f7fbeceacae4c0576cc2b343bac':
  Tweak prelink map