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

Change-Id: I7a2730b87b8996534db50d1e9cd6f7d6b9f75585