Merge "libhidl: add withDefault"