am dd24e27d: am c67a10e6: resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp

* commit 'dd24e27dd68adc52b2904e776ab5dd41895c224b':
  Use the standard NDK,SDK versions so that we pick up the correct crt files
  Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.
  Don't use stale NDK libraries for IA