Merge pull request #1 from CocoaPods/master

更新主线
fix library path error
fix library path error
Merge pull request #2 from CocoaPods/master

merge from cocoapods
Merge pull request #1810 from lutaf/master

fix library path error for umeng analytics sdk