[gtk] (4 commits) Non-fast-forward update to branch matthiasc/for-master

[Matthias Clasen <matthiasc src gnome org>]

The branch 'matthiasc/for-master' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  d7b6830... widget-factory: Simplify the ui file
  9c4fb24... Simplify our ui files
  fa0ad43... a11y: Simplify atspi context a bit

Commits added to the branch:

  dfc905f... buildertool: Fix a simplify issue
  e89d608... widget-factory: Simplify the ui file
  f473f28... Simplify our ui files
  6896b42... a11y: Simplify atspi context a bit