Merge "Tweak prelink map"