Cleanup colormess

Conflicts:
	core/java/android/util/ColorUtils.java
Cleanup colormess fix