Merge changes I23836041,Ic0c9754d,Iae781f49

* changes:
  Update GVR prebuilts to CL@146314416
  Add 6dof to the list of supported gvr features
  Fix an incorrect LOG_ALWAYS_FATAL_IF introduced in sweep