Merge "xci: Remove obsolete bifrost dib ELEMENTS_PATH"