Add back USE_RETIRE_FENCE and TARGET_PROVIDES_LIBLIGHT
display-caf : Add back DISPLAY_VARIANT build barrier
Update include paths

Change-Id: I463eb0a6693ec5da41118f132d8dcdb0d11e4be8