Clean up CAPIF generation

Change-Id: Idaa78935e73726d58099a35bf63fbc76eb4669f0
5 files changed