am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit 'af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef':
  Tweak prelink map