Merge "Expand HWVULKAN_HARDWARE_MODULE_ID macro." am: d8a5c01345

Change-Id: Idc7eaa708b1a5eb63f7dca48c62d654a2e8b83de