resolved conflicts for merge of d11eac34 to lmp-dev-plus-aosp

Change-Id: I3cd9056d5d689b783f4afa870397ad4d9de357f5

diff --cc libc/arch-x86/x86.mk
index 9f2188c,2a0609d..e73ed1d
--- 1/libc/arch-x86/x86.mk
--- 2/libc/arch-x86/x86.mk
+++ b/libc/arch-x86/x86.mk
@@@ -38,8 -23,9 +38,9 @@@ libc_freebsd_src_files_x86 += 
  libc_bionic_src_files_x86 += \
      arch-x86/bionic/__bionic_clone.S \
      arch-x86/bionic/_exit_with_stack_teardown.S \
+     arch-x86/bionic/libgcc_compat.c \
 +    arch-x86/bionic/__restore_rt.S \
 +    arch-x86/bionic/__restore.S \
      arch-x86/bionic/_setjmp.S \
      arch-x86/bionic/setjmp.S \
      arch-x86/bionic/__set_tls.c \