Merge "hwc: Use display_defs.h"