Merge "HIDL changes for IWLAN refactoring"
am: 4365f2e6bc

Change-Id: If44163c860bcaa23c77d40cbb4512637d1c65c1f