Merge "Adapt change in HIDL hal and remove old hal version logic"