Some changes

Conflicts:
	core/res/res/values/dimens.xml
	packages/SystemUI/res/layout/halo_speech.xml

Change-Id: I3a9befc64915fbba9b9bbe421a936f3ef5d63906

Conflicts:
	packages/SystemUI/res/values/dimens.xml