Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev am: 906948e7e2
am: d939f92dd0

Change-Id: If83f2175a06961cbe30ab1dfe9b849752ba882f3