am 84891367: am 9bd85361: am 15ced7e1: Merge prelink map tweaks

* commit '8489136766b282d95f6e447a5ff4d63fbdbe8409':
  Tweak prelink map