Merge "mv WeaverHidlWrapper WeaverHidlAdapter; refactor"