Merge commit '3d23421c' into froyo-plus-aosp * commit '3d23421c': For issue #2651381, allow library prelinking.