am 32880844: For issue #2651381, allow library prelinking.

Merge commit '328808449dccdce0ec4100174446a8b2c964a6b1' into froyo-plus-aosp

* commit '328808449dccdce0ec4100174446a8b2c964a6b1':
  For issue #2651381, allow library prelinking.