PM Modi meets Saudi Prince Salman in Osaka, discusses counter-terrorism, trade