Merge "Update to VrSetFIFOThreadTest" into oreo-cts-dev