am 801f558c: For issue #2651381, allow library prelinking.

Merge commit '801f558c85ee5c224a03e3456a6dbdb217051164' into froyo-plus-aosp

* commit '801f558c85ee5c224a03e3456a6dbdb217051164':
  For issue #2651381, allow library prelinking.