Update Halo

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d
Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml