Revert "update qcom/display and cfx-Toolchain branches"

This reverts commit b6d26fb16bb75133188c98ea7d241deedcfc1acc.
update qcom/display branch

Change-Id: I1cb54208c69a6b4623a9ed31652daafae8742296