am 4ee507f2: For issue #2651381, allow library prelinking.

Merge commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9' into froyo-plus-aosp

* commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9':
  For issue #2651381, allow library prelinking.