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

* commit 'c13e5c1cd44a3073caf33c4f043a9474530a0d7d':
  ndk: Fix android-3/arch-arm crt{begin,end}_so.o