Merge omapdss header refactoring