Merge changes I67efa36e,I866e56ad

am: bd0338cdc2

* commit 'bd0338cdc254639cbc04f2c415d8c98704bc2028':
  Fix symbols ordering
  Remove unwanted stdio symbols from android-18 and 19

ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt

@@ -135,23 +135,14 @@ __restore_core_regs
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sclose
 __set_tls
-__sflags
-__sflush
-__sfp
-__sinit
-__smakebuf
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __subdf3
 __subsf3
 __swbuf
-__swrite
 __swsetup
 __sym_ntop
 __sym_ntos
@@ -174,7 +165,6 @@ __unordsf2
 __wait4
 __waitid
 _exit
-_fwalk
 _getlong
 _getshort
 _longjmp

ndk/platforms/android-18/arch-mips/symbols/libc.so.functions.txt

@@ -104,21 +104,12 @@ __res_send_setrhook
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sclose
 __set_tls
-__sflags
-__sflush
-__sfp
-__sinit
-__smakebuf
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __swbuf
-__swrite
 __swsetup
 __sym_ntop
 __sym_ntos
@@ -137,7 +128,6 @@ __wait4
 __waitid
 _exit
 _flush_cache
-_fwalk
 _getlong
 _getshort
 _longjmp

ndk/platforms/android-18/arch-x86/symbols/libc.so.functions.txt

@@ -106,21 +106,12 @@ __res_send_setrhook
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sclose
 __set_thread_area
-__sflags
-__sflush
-__sfp
-__sinit
-__smakebuf
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __swbuf
-__swrite
 __swsetup
 __sym_ntop
 __sym_ntos
@@ -140,7 +131,6 @@ __umoddi3
 __wait4
 __waitid
 _exit
-_fwalk
 _getlong
 _getshort
 _longjmp

ndk/platforms/android-19/arch-arm/symbols/libc.so.functions.txt

@@ -135,23 +135,14 @@ __restore_core_regs
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sclose
 __set_tls
-__sflags
-__sflush
-__sfp
-__sinit
-__smakebuf
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __subdf3
 __subsf3
 __swbuf
-__swrite
 __swsetup
 __sym_ntop
 __sym_ntos
@@ -174,7 +165,6 @@ __unordsf2
 __wait4
 __waitid
 _exit
-_fwalk
 _getlong
 _getshort
 _longjmp

ndk/platforms/android-19/arch-mips/symbols/libc.so.functions.txt

@@ -104,21 +104,12 @@ __res_send_setrhook
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sclose
 __set_tls
-__sflags
-__sflush
-__sfp
-__sinit
-__smakebuf
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __swbuf
-__swrite
 __swsetup
 __sym_ntop
 __sym_ntos
@@ -137,7 +128,6 @@ __wait4
 __waitid
 _exit
 _flush_cache
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -759,10 +749,9 @@ unlockpt
 unsetenv
 usleep
 utime
+utimensat
 utimes
-utimensat
 utmpname
-utimensat
 valloc
 vasprintf
 verr

ndk/platforms/android-19/arch-x86/symbols/libc.so.functions.txt

@@ -106,21 +106,12 @@ __res_send_setrhook
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
-__sclose
 __set_thread_area
-__sflags
-__sflush
-__sfp
-__sinit
-__smakebuf
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __swbuf
-__swrite
 __swsetup
 __sym_ntop
 __sym_ntos
@@ -140,7 +131,6 @@ __umoddi3
 __wait4
 __waitid
 _exit
-_fwalk
 _getlong
 _getshort
 _longjmp