Merge "HIDL changes for IWLAN refactoring"