Merge "No-op code cleanup for IInputMethodWrapper"