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

Change-Id: I93a5fb02746d502dcd2ce63d8a6f77cad83bd21c