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

Change-Id: I0b4df8aec5a688a66ae23d7148543fbb00a48560