Tiny fixes for building on vanilla display driver.

Change-Id: I825212305a6dd2c800afcc0bb9ff19070d757f33