Merge "hikey960: Add build option TARGET_BUILTIN_EDID"
am: b5083a3c23

Change-Id: I43f255a7ea45bc33878d352ac73853751d74de8a