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