Merge "gpu_tm: Use vendor module for header includes"