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