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

Change-Id: Ia8f014fb1492eb9276ed56e80a23744000f90625