Merge "QCamera2 :  memory leak with memory buffer allocations and deallocation"