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

Change-Id: I448110e9bfb9d5991b8cf38403af91f92e11b94e