Remove *hdmi* as well...

Change-Id: I6cf02e167941e7722030c157004e77c8636369d4
Build fixes