Merge "[UserHal] Fix emulated vhal --user-hal"