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

Change-Id: I22b73519b7377252e926a0fdb7bcdaf27cc50d6b