India and China end Himalayan border stand-off