[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:

  a73398f... gtk-builder-tool: Simplify more
  57485aa... buildertool: Fix a simplify issue
  1355f8c... Simplify our ui files
  d954386... a11y: Simplify atspi context a bit

Commits added to the branch:

  6f00267... gtk-builder-tool: Simplify more
  fd0a5e3... buildertool: Fix a simplify issue
  160aeb4... Simplify our ui files
  01abd15... a11y: Simplify atspi context a bit