am 458f0633: For issue #2651381, allow library prelinking.

Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into froyo-plus-aosp

* commit '458f06335a73438865bf633aeff399cbaedb71e1':
  For issue #2651381, allow library prelinking.