Enable ZSL

Move overlay from Gallery2 to Camera2, and remove all the options except
enable zsl since the rest don't exist (anymore/yet)

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