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

Change-Id: I7f67785d81650c2dd15eaa10c59e4a110c68a47e