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