Merge "hwc: Load diag lib based on property value"