display: clean up Makefiles and fix build
Jay Wu

Change-Id: I58d68a46c1e97de9336b3552941612d0890f74ae