Merge "ndk: Fix android-3/arch-arm crt{begin,end}_so.o"