Merge remote-tracking branch 'opensource/efl-1.16' into tizen

Merge remote-tracking branch 'opensource/efl-1.16' into tizen

Conflicts:
	Makefile.am
	NEWS
	configure.ac
	data/ecore/ecore_wayland/protocol/subsurface.xml
	pc/.gitignore
	src/Makefile.am
	src/Makefile_Ecore_Buffer.am
	src/Makefile_Ecore_Evas.am
	src/Makefile_Ecore_Wayland.am
	src/Makefile_Ector.am
	src/Makefile_Efl.am
	src/Makefile_Efl_Cxx.am
	src/Makefile_Eina.am
	src/Makefile_Evas.am
	src/Makefile_Evas_Cxx.am
	src/bin/ecore_evas/.gitignore
	src/bin/edje/edje_cc_handlers.c
	src/bindings/eo_cxx/eo_inherit_bindings.hh
	src/examples/ecore/Makefile.am
	src/examples/ecore/ecore_buffer_example.c
	src/examples/edje/Makefile.am
	src/examples/evas/evas-images4.c
	src/examples/evas/evas-vg-batman.c
	src/examples/evas/evas-vg-simple.c
	src/lib/ecore/ecore_timer.eo
	src/lib/ecore_buffer/Ecore_Buffer.h
	src/lib/ecore_buffer/Ecore_Buffer_Queue.h
	src/lib/ecore_buffer/buffer_queue.c
	src/lib/ecore_buffer/buffer_queue.h
	src/lib/ecore_buffer/ecore_buffer.c
	src/lib/ecore_buffer/ecore_buffer_consumer.c
	src/lib/ecore_buffer/ecore_buffer_private.h
	src/lib/ecore_buffer/ecore_buffer_provider.c
	src/lib/ecore_buffer/shared_buffer.c
	src/lib/ecore_buffer/shared_buffer.h
	src/lib/ecore_drm/Ecore_Drm.h
	src/lib/ecore_drm/ecore_drm.c
	src/lib/ecore_drm/ecore_drm_device.c
	src/lib/ecore_drm/ecore_drm_evdev.c
	src/lib/ecore_drm/ecore_drm_inputs.c
	src/lib/ecore_drm/ecore_drm_launcher.c
	src/lib/ecore_drm/ecore_drm_logind.c
	src/lib/ecore_drm/ecore_drm_output.c
	src/lib/ecore_drm/ecore_drm_private.h
	src/lib/ecore_drm/ecore_drm_tty.c
	src/lib/ecore_imf/Ecore_IMF.h
	src/lib/ecore_imf_evas/ecore_imf_evas.c
	src/lib/ecore_wayland/Ecore_Wayland.h
	src/lib/ecore_wayland/ecore_wl.c
	src/lib/ecore_wayland/ecore_wl_input.c
	src/lib/ecore_wayland/ecore_wl_private.h
	src/lib/ecore_wayland/ecore_wl_subsurf.c
	src/lib/ecore_wayland/ecore_wl_window.c
	src/lib/ecore_wayland/subsurface-client-protocol.h
	src/lib/ecore_wayland/subsurface-protocol.c
	src/lib/ecore_wayland/xdg-shell-client-protocol.h
	src/lib/ecore_wayland/xdg-shell-protocol.c
	src/lib/ecore_x/Ecore_X_Atoms.h
	src/lib/ecore_x/ecore_x_atoms_decl.h
	src/lib/ecore_x/xlib/ecore_x_e.c
	src/lib/ecore_x/xlib/ecore_x_keygrab.c
	src/lib/ector/cairo/Ector_Cairo.h
	src/lib/ector/cairo/ector_cairo_private.h
	src/lib/ector/cairo/ector_cairo_surface.c
	src/lib/ector/cairo/ector_cairo_surface.eo
	src/lib/ector/cairo/ector_renderer_cairo_base.c
	src/lib/ector/cairo/ector_renderer_cairo_base.eo
	src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
	src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
	src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
	src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
	src/lib/ector/cairo/ector_renderer_cairo_shape.c
	src/lib/ector/cairo/ector_renderer_cairo_shape.eo
	src/lib/ector/ector_generic_surface.eo
	src/lib/ector/ector_private.h
	src/lib/ector/ector_renderer_base.c
	src/lib/ector/ector_renderer_generic_base.eo
	src/lib/ector/ector_renderer_generic_shape.eo
	src/lib/ector/software/Ector_Software.h
	src/lib/ector/software/ector_drawhelper.c
	src/lib/ector/software/ector_drawhelper_private.h
	src/lib/ector/software/ector_drawhelper_sse2.c
	src/lib/ector/software/ector_renderer_software_gradient_linear.c
	src/lib/ector/software/ector_renderer_software_gradient_linear.eo
	src/lib/ector/software/ector_renderer_software_gradient_radial.c
	src/lib/ector/software/ector_renderer_software_gradient_radial.eo
	src/lib/ector/software/ector_renderer_software_shape.c
	src/lib/ector/software/ector_renderer_software_shape.eo
	src/lib/ector/software/ector_software_gradient.c
	src/lib/ector/software/ector_software_private.h
	src/lib/ector/software/ector_software_rasterizer.c
	src/lib/ector/software/ector_software_surface.c
	src/lib/ector/software/ector_software_surface.eo
	src/lib/ector/software/sw_ft_math.c
	src/lib/ector/software/sw_ft_math.h
	src/lib/ector/software/sw_ft_raster.c
	src/lib/ector/software/sw_ft_raster.h
	src/lib/ector/software/sw_ft_stroker.c
	src/lib/ector/software/sw_ft_stroker.h
	src/lib/ector/software/sw_ft_types.h
	src/lib/edje/Edje_Common.h
	src/lib/edje/Edje_Edit.h
	src/lib/edje/edje_calc.c
	src/lib/edje/edje_data.c
	src/lib/edje/edje_edit.c
	src/lib/edje/edje_load.c
	src/lib/edje/edje_object.eo
	src/lib/edje/edje_private.h
	src/lib/edje/edje_program.c
	src/lib/edje/edje_smart.c
	src/lib/efl/Efl.h
	src/lib/efl/interfaces/efl_file.eo
	src/lib/efl/interfaces/efl_gfx_base.eo
	src/lib/efl/interfaces/efl_gfx_fill.eo
	src/lib/efl/interfaces/efl_gfx_gradient_base.eo
	src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
	src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
	src/lib/efl/interfaces/efl_gfx_shape.c
	src/lib/efl/interfaces/efl_gfx_shape.eo
	src/lib/efl/interfaces/efl_gfx_stack.eo
	src/lib/efl/interfaces/efl_gfx_view.eo
	src/lib/efl/interfaces/efl_interfaces_main.c
	src/lib/eina/Eina.h
	src/lib/eina/eina_main.c
	src/lib/eina/eina_matrix.c
	src/lib/eina/eina_matrix.h
	src/lib/eina/eina_quad.c
	src/lib/eina/eina_quad.h
	src/lib/eina/eina_simple_xml_parser.h
	src/lib/eldbus/eldbus_message.h
	src/lib/eo/Eo.h
	src/lib/evas/Evas_Common.h
	src/lib/evas/Evas_Eo.h
	src/lib/evas/Evas_Legacy.h
	src/lib/evas/canvas/efl_vg_base.eo
	src/lib/evas/canvas/efl_vg_container.eo
	src/lib/evas/canvas/efl_vg_gradient.eo
	src/lib/evas/canvas/efl_vg_gradient_linear.eo
	src/lib/evas/canvas/efl_vg_gradient_radial.eo
	src/lib/evas/canvas/efl_vg_shape.eo
	src/lib/evas/canvas/evas_callbacks.c
	src/lib/evas/canvas/evas_image.eo
	src/lib/evas/canvas/evas_object.eo
	src/lib/evas/canvas/evas_object_image.c
	src/lib/evas/canvas/evas_object_main.c
	src/lib/evas/canvas/evas_object_vg.c
	src/lib/evas/canvas/evas_render.c
	src/lib/evas/canvas/evas_text.eo
	src/lib/evas/canvas/evas_vg.eo
	src/lib/evas/canvas/evas_vg_container.c
	src/lib/evas/canvas/evas_vg_gradient.c
	src/lib/evas/canvas/evas_vg_gradient_linear.c
	src/lib/evas/canvas/evas_vg_gradient_radial.c
	src/lib/evas/canvas/evas_vg_node.c
	src/lib/evas/canvas/evas_vg_private.h
	src/lib/evas/canvas/evas_vg_root_node.c
	src/lib/evas/canvas/evas_vg_shape.c
	src/lib/evas/common/evas_font_draw.c
	src/lib/evas/common/evas_font_load.c
	src/lib/evas/common/evas_scale_sample.c
	src/lib/evas/include/evas_private.h
	src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
	src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
	src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
	src/modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
	src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
	src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
	src/modules/ecore_imf/wayland/wayland_imcontext.c
	src/modules/ecore_imf/wayland/wayland_imcontext.h
	src/modules/ecore_imf/wayland/wayland_module.c
	src/modules/evas/engines/drm/evas_bufmgr.c
	src/modules/evas/engines/drm/evas_drm.c
	src/modules/evas/engines/drm/evas_engine.h
	src/modules/evas/engines/gl_common/evas_gl_api.c
	src/modules/evas/engines/gl_common/evas_gl_api_ext.c
	src/modules/evas/engines/gl_common/evas_gl_api_ext.h
	src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h
	src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
	src/modules/evas/engines/gl_common/evas_gl_common.h
	src/modules/evas/engines/gl_common/evas_gl_context.c
	src/modules/evas/engines/gl_common/evas_gl_core.c
	src/modules/evas/engines/gl_common/evas_gl_core.h
	src/modules/evas/engines/gl_common/evas_gl_core_private.h
	src/modules/evas/engines/gl_common/evas_gl_texture.c
	src/modules/evas/engines/gl_drm/evas_drm.c
	src/modules/evas/engines/gl_drm/evas_drm_main.c
	src/modules/evas/engines/gl_drm/evas_engine.c
	src/modules/evas/engines/gl_drm/evas_engine.h
	src/modules/evas/engines/gl_generic/ector_cairo_software_surface.eo
	src/modules/evas/engines/gl_generic/evas_engine.c
	src/modules/evas/engines/gl_sdl/evas_engine.c
	src/modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h
	src/modules/evas/engines/gl_x11/evas_engine.c
	src/modules/evas/engines/gl_x11/evas_x_main.c
	src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo
	src/modules/evas/engines/software_generic/evas_engine.c
	src/modules/evas/engines/software_x11/evas_xlib_swapper.c
	src/modules/evas/engines/wayland_egl/evas_engine.c
	src/modules/evas/engines/wayland_egl/evas_engine.h
	src/modules/evas/engines/wayland_shm/evas_engine.c
	src/modules/evas/engines/wayland_shm/evas_engine.h
	src/modules/evas/engines/wayland_shm/evas_outbuf.c
	src/modules/evas/engines/wayland_shm/evas_shm.c
	src/tests/evas/evas_test_filters.c

Change-Id: I5fc126ca1611586f9c386265d2dae47eea5679ef