Merge changes from topic 'o-compositor-unification' into oc-dev

* changes:
  Remove the VR compositor from the framework.
  Remove unnecessary clients and rename files.
  Support multiple consumer queues.
  Return pdx::Status<T> from BufferHubQueue::Dequeue.
  Add support for consumer queue initial import and hangup.

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge