am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '2ba042f9d86c7715cbca07e0fd417d8cf9496846':
  Tweak prelink map