[ot-face] Unify GSUB/GPOS accelerators in the table accelerator framework

src/hb-aat-layout.cc

diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc
index 24ec53b..c481e6a 100644
--- a/src/hb-aat-layout.cc
+++ b/src/hb-aat-layout.cc
@@ -26,9 +26,7 @@
 
 #include "hb-open-type.hh"
 
-#include "hb-ot-layout.hh"
-#include "hb-ot-layout-gsubgpos.hh"
-
+#include "hb-ot-face.hh"
 #include "hb-aat-layout.hh"
 #include "hb-aat-layout-ankr-table.hh"
 #include "hb-aat-layout-bsln-table.hh" // Just so we compile it; unused otherwise.