Merge "Use ANGLEGetDisplayPlatform for ANGLE determination"