Gallery2: Move CAF strings

Change-Id: I04adc709f0828be535a008b0914270d5bb903bdc
Merge branch 'cm' into HEAD