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: Ia80504f25a2c2f18be93d0c9cb07fd1af716e818
Merge branch 'cm' into HEAD