Revert "serrano: Properly enable ZSL"

Great! Fixed HDR but camera app crashes when switching tvideo
and panorama. Fix one thing, break two others. Just great

This reverts commit ef776b152c0d3e376f01ea30d7c2a1b21ca48fb6.

Change-Id: I84ee6600d0b7245f2f34153634f89e14289230fc
Merge branch 'cm-11.0' into kk_mkt