Merge change Ifb9dee6f into eclair

* changes:
  Add support for armeabi-v7a to the NDK.