Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev