camera: Actually fix ZSL :)

Change-Id: I921c10e2dfd8694fc13ba8bc9def59c498322f4f
Merge branch 'cm-11.0' into martincz