Tension between India and China may be thawing, but the two countries still remain bitter rivals, writes Shyam Saran.