Merge "ANGLE moved ANGLEGetDisplayPlatform to libGLESv2"