Merge "For issue #2651381, allow library prelinking." into froyo