Added Display and Media variants

Change-Id: I301c9dd2767ed3c8f4e4d3081afca9dfd2dc4118
Added kernel-header location as per new structure

Change-Id: I65c423d28857019112d3e50b893b9bc0337791b6