am aac9729f: am 4ebb44e8: Merge "Fix libgui tests."

* commit 'aac9729fbe52a84166a8963927a3edb3a6c051bd':
  Fix libgui tests.