Camera2: Make some strings translatable again

Change-Id: I2a5d5c2a841b0d81177978b728d354c693115eb1

Conflicts:

	res/values/qcomstrings.xml