am 4e1e20f5: (-s ours) Fix build - don\'t prelink glib - do not merge

* commit '4e1e20f508d5a4deff8854cc9f54251f1facad81':
  Fix build - don't prelink glib - do not merge