Merge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev
am: b2bae26bf4

Change-Id: I2fc4e48314aed88f3360049c28c8dbcec16a2235