Merkel says disarmament efforts must include China as well as US, Russia