Merge "Camera NDK: fix release image failure during destructor" into oc-mr1-dev am: 01fc3aee04
am: 7725397209

Change-Id: I5ce8530393d4ebacbd366ed182e388e38e7802f8