am f771489d: Merge "Tweak prelink map, more"
am f771489d: Merge "Tweak prelink map, more"

* commit 'f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
  Tweak prelink map, more

hagar006/platform_manifest,knone1/platform_manifest,see4ri/lolili,xorware/android_build,ND-3500/platform_manifest,pranav01/platform_manifest,xorware/android_build,fallouttester/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest,xorware/android_build,xorware/android_build,Hybrid-Power/startsync