Merge "Revert "Write out export_includes whenever the module is built.""