[Android] VLC Android build broken

[Edward Wang]

Hello,

Since revision 95eb79718122dcc8f586cbbd10f8b0feb2fa4fa4 ("deinterlace: 
rewrite ARM optimizations for 8-bits merge"), the VLC for Android build 
has been broken [1][2]:

../vlc/android/modules/video_filter/.libs/libdeinterlace_plugin.a(libdeinterlace_plugin_la-deinterlace.o): 
In function `Open':
/home/buildslave/slave/nb-arm-android-v6-nofpu/build/vlc/android/modules/video_filter/../../../modules/video_filter/deinterlace/deinterlace.c:670: 
undefined reference to `merge16_arm_neon'
/home/buildslave/slave/nb-arm-android-v6-nofpu/build/vlc/android/modules/video_filter/../../../modules/video_filter/deinterlace/deinterlace.c:670: 
undefined reference to `merge16_armv6'
/home/buildslave/slave/nb-arm-android-v6-nofpu/build/vlc/android/modules/video_filter/../../../modules/video_filter/deinterlace/deinterlace.c:670: 
undefined reference to `merge8_arm_neon'
/home/buildslave/slave/nb-arm-android-v6-nofpu/build/vlc/android/modules/video_filter/../../../modules/video_filter/deinterlace/deinterlace.c:670: 
undefined reference to `merge8_armv6'
collect2: ld returned 1 exit status

I was able to consistently get the error with a fresh clone of vlc.git, 
including everything up to d12a67f403d9cd91c4c84d7681ed736936fbf71f 
("deinterlace: fix build"). Reverting only 
95eb79718122dcc8f586cbbd10f8b0feb2fa4fa4 on top of master seems to work 
for me. Any thoughts or actions?

Regards,
         Edward Wang

[1] 
http://buildbot.videolan.org/builders/nb-arm-android-v6-nofpu/builds/65/steps/Build%20Contribs/logs/stdio

[2] 
http://buildbot.videolan.org/builders/nb-arm-android-v7-tegra2/builds/58/steps/Build%20Contribs/logs/stdio