Merge "Expand HWVULKAN_HARDWARE_MODULE_ID macro." am: d8a5c01345 am: 6a303d8c1b

Change-Id: I6e1fc5ee265fc888da9f1de2a2e28a75444cea4a