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

Change-Id: I0007db72b0ca923c0e42bbb6ddadf34e927b5612