Update colorpicker from slims

Change-Id: I9ae92370cfdeb91bda6a4e628c0755b1a45917be

Conflicts:
	res/layout-land/dialog_color_picker.xml
	src/net/margaritov/preference/colorpicker/ColorPickerView.java