Merge "Use -Werror in hardware/qcom/display"