Merge "libhidl: Add wifi keystore HAL" into oc-dev