Merge prelink map tweaks

Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681