Merge "Remove slices from buffers" into oc-dev

diff --cc libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
index 435cba4,c886c27..81e1669
--- 1/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
--- 2/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
+++ b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
@@@ -138,12 -138,12 +138,12 @@@ status_t BufferHubQueueProducer::dequeu
  
    for (size_t retry = 0; retry < BufferHubQueue::kMaxQueueCapacity; retry++) {
      LocalHandle fence;
-     auto buffer_status  =
+     auto buffer_status =
          core_->producer_->Dequeue(core_->dequeue_timeout_ms_, &slot, &fence);
 -    if (!buffer_producer)
 -      return NO_MEMORY;
  
      buffer_producer = buffer_status.take();
 +    if (!buffer_producer)
 +      return NO_MEMORY;
  
      if (width == buffer_producer->width() &&
          height == buffer_producer->height() &&