Try to fix build (?

Conflicts:
	core/java/android/inputmethodservice/InputMethodService.java