Merge "libvrhwc: Fix dependency order because Soong." into oc-dev