Merge "Camera: Keep a list of outstanding buffers" into nyc-dev
am: bb969e7

* commit 'bb969e7b2230b520a903b22fb6e89c3e14d38ad8':
  Camera: Keep a list of outstanding buffers

Change-Id: Iae13cdda0b65d9867e8dc7c6082637ed01275852