layer: revert to original form_cdi interface#15

sameo merged 1 commit intorivosinc:mainrivosinc/rice:mainfrom

dgreid:topic/cert_lifetimedgreid/rice:topic/cert_lifetimeCopy head branch name to clipboard