am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo

Merge commit '89ad07b048ff035394596d6a8916f639f3f0b868' into kraken

* commit '89ad07b048ff035394596d6a8916f639f3f0b868':
  For issue #2651381, allow library prelinking.