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

* commit '5db288c5e9f8969c7eabeb5b22187ae8d6618fdf':
  Fix build - don't prelink glib - do not merge