Fix ios library search
Merge branch 'update' into update.linux