Add retire_fen_fd for hardware/qcom/display/msm8974/libhwcomposer/hwc_utils.cpp
and other minor changes