Merge "Camera: fix bufferFreed callback object lifecycle issue" into oc-dr1-dev
am: 32ab0585ff

Change-Id: Ief8f546531f68d6521f69ad0e8d7307b390703c6