Revert "GNU Radio EXPAND macros for template files:"

This reverts commit 6fc200fcba65cc4d18d7b10381da72769c0183c4.

The original commit causes excessive rebuild sensitivity by
regenerating many public API header files at cmake time instead
of at build time.
Merge branch 'master' into next