Dropped XComponent from merged interface because noone is using it.

Change-Id: Id22c49e63679f42d86f617a919fdfd7cea4d5381