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

Change-Id: Ie15f3783ce62a4fb24af2abf3f335ffa50b7688e