smdk4412-common: rename Gallery2 -> Camera2

Change-Id: Id8d11bb4a864060d0bc49fd9da28c4ca09c851d6
Camera2: Don't reset the focus mode when using TTF

The mode switch makes the previous focus result go away
at snapshot time, and we don't want that.

Change-Id: I5a3c9e6e945b095f5bbcd724ef32222c77c53c23
Merge branch 'CyanogenMod/cm-11.0'

Conflicts:
	overlay/packages/apps/Camera2/res/values/config.xml