Merge "Fix struct vs. class mismatch in forward definitions"

namespace android {

class BufferSlot;

struct BufferSlot;

class BufferQueueProducer : public BnGraphicBufferProducer,

                            private IBinder::DeathRecipient {