am 0a846112: am 2e00a813: am c7f23b57: Merge change Ifb9dee6f into eclair

Merge commit '0a84611272549cf0fcee2bca5dde25ee20123ab8'

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