The great torch tile disaster

Conflicts:
	core/java/com/android/internal/util/rascarlo/TorchConstants.java