EFL core migration revision 69917

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	src/lib/edje_util.c

diff --cc src/bin/edje_cc_handlers.c
Simple merge

diff --cc src/lib/Edje.h
Simple merge

diff --cc src/lib/edje_entry.c
Simple merge

diff --cc src/lib/edje_program.c
Simple merge

diff --cc src/lib/edje_util.c
Simple merge