Merge "Enable FULL_TREBLE on hikey/hikey960"