am c7f23b57: Merge change Ifb9dee6f into eclair

Merge commit 'c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2

* commit 'c7f23b570c16d99ce30b9819e28caee480795030':
  Add support for armeabi-v7a to the NDK.