Merge prelink map tweaks

Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063