Merge branch 'upstream' into tizen

diff --combined bin/Makefile.am
index 9427873,5993577..b0600ce
--- 1/bin/Makefile.am
--- 2/bin/Makefile.am
+++ b/bin/Makefile.am
@@@ -9,13 -9,11 +9,14 @@@ fribidi_SOURCES = fribidi-main.c $(geto
  fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
  
  AM_CPPFLAGS = \
+               @FRIBIDI_CPPFLAGS@ \
                -I$(top_builddir)/lib \
                -I$(top_srcdir)/lib
  
  LDADD = $(top_builddir)/lib/libfribidi.la
 +### TIZEN_ONLY(20170811): Apply ASLR to executable files.
 +fribidi_LDFLAGS = -pie
 +fribidi_CFLAGS = -fPIE
  
  $(top_builddir)/lib/libfribidi.la:
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi.la