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

Merge commit '2e00a8137d02b7478687f08431cd1f62abf17344' into eclair-mr2-plus-aosp

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