Merge "BufferQueueProducer: Slot may have null buffer" into rvc-dev am: 256a877a84 am: eab00853dd am: d8ddf5d8bf am: 1429c8c0ae

Change-Id: Ia91d88f926dc1a777633ecf7e5ad2f226af9f180