Merge "Search for subhal .so files in additional directories" into rvc-dev