Merge "Tweak prelink map, more"