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

Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp

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