display: Remove more mako-specific flags

These display flags aren't used on any Sony device.

Also do a little rearrangement for cleaning.

Change-Id: Id8466add30e51d026f5817889b2ab91895d0fe7f