Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev
am: d8ef90752b

Change-Id: I713984531740a01f33335d516393a522b662d53c