Merge "libhardware: make vr vendor only" into main