Merge "Camera: Consider the currently acquired input buffers"
am: fc0fa0c91b

Change-Id: Id0d742d6742426f55b6463ec8b110f17fc8b0875