Merge "Camera: fix buffer leak in device error condition" into oc-dr1-dev am: 7bb115f103
am: f021afb795

Change-Id: I056f09693578de2b05f6760d1adfd745967d14ae