am 85b7b818: (-s ours) am adb14248: (-s ours) Fix build - don\'t prelink glib - do not merge

* commit '85b7b818d1cd9c82d0b951aabc9242c5749a019e':
  Fix build - don't prelink glib - do not merge