display-caf-bfam: Add variant filtering and update header paths

Change-Id: I52fc91c662356702b05a57029ab5835647448e10