am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo

Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken

* commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b':
  Fixed a bunch of stuff in the prelink mappings file: