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

Change-Id: Id364f718a88ac5e13b8401ac8e1b095ba74dc73e