am c70d0775: am 5b834692: merge intel x86 patches into gingerbread branch
* commit 'c70d0775580ad6f86d43fe1af4e79ac556e86735': Don't use stale NDK libraries for IAmain
commit
bbce9d6802
* commit 'c70d0775580ad6f86d43fe1af4e79ac556e86735': Don't use stale NDK libraries for IAmain