Camera2: Remove aapt warnings

Change-Id: I4f02d2a8bd1a230326fca70c3deafb31987a8b84

Conflicts:
	res/values-hu/cm_strings.xml
	res/values-th/cm_strings.xml