Merge "hikey960: Add build option TARGET_BUILTIN_EDID"