Merge "hikey/hikey960: Add ro.hardware.egl=mali" into main