[gnome-builder] build: Simplify bundled template-glib support

[Patrick Griffis <pgriffis src gnome org>]

commit a77fd27ae0cab4ebabf68581688ae6949bf4ad94
Author: Patrick Griffis <tingping tingping se>
Date:   Fri Jun 9 18:33:41 2017 -0400

    build: Simplify bundled template-glib support

 meson.build               |    6 +-----
 subprojects/template-glib |    2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 09e359f..7a349f1 100644
--- a/meson.build
+++ b/meson.build
@@ -145,11 +145,7 @@ if not libtemplate_glib_dep.found()
     default_options: [
       'with_introspection=true',
       'with_vapi=true',
-      'pkglibdir=' + pkglibdir,
-      'pkgincludedir=' + pkgincludedir,
-      'pkggirdir=' + pkggirdir,
-      'pkgvapidir=' + pkgvapidir,
-      'pkgtypelibdir=' + pkgtypelibdir,
+      'package_subdir=' + meson.project_name()
     ]
   )
   libtemplate_glib_dep = libtemplate_glib.get_variable('libtemplate_glib_dep')
diff --git a/subprojects/template-glib b/subprojects/template-glib
index 2c0efb5..920a201 160000
--- a/subprojects/template-glib
+++ b/subprojects/template-glib
@@ -1 +1 @@
-Subproject commit 2c0efb5d7258f2a6ad5b64109957390d441f18bc
+Subproject commit 920a201b670617c1c5a2b4dfff028ea64886453c