Snap for 6690197 from df8a0739 to rvc-release

/**

 * ASurfaceTexture_dequeueBuffer returns the next available AHardwareBuffer.

 * The caller gets ownership of the buffer and need to release it with

 * AHardwareBuffer_release.

 */

AHardwareBuffer* ASurfaceTexture_dequeueBuffer(ASurfaceTexture* st, int* outSlotid,

                                               android_dataspace* outDataspace,

            *outNewContent = true;

        }

    } while (buffer.get() && (!queueEmpty));

    return reinterpret_cast<AHardwareBuffer*>(buffer.get());

    AHardwareBuffer* result = nullptr;

    if (buffer.get()) {

      result = buffer->toAHardwareBuffer();

      // add a reference to keep the hardware buffer alive, even if

      // BufferQueueProducer is disconnected. This is needed, because

      // sp reference is destroyed at the end of this function.

      AHardwareBuffer_acquire(result);

    }

    return result;

}

} // namespace android