Cleanup: remove custom macros
Cleanup: remove custom macros

Change-Id: I06e5daac619c392c1faef789b0966ed746ad1f60

GoogleCloudPlatform/kms-integrations,GoogleCloudPlatform/kms-integrations,GoogleCloudPlatform/kms-integrations,GoogleCloudPlatform/kms-integrations,GoogleCloudPlatform/kms-integrations,GoogleCloudPlatform/kms-integrations