Fix build

(cherry picked from commit c3386a2a0f6a303c46157933d1c363cbee243ab8)

Conflicts:
	res/values/cr_arrays.xml