Colombia, US discuss military aid