Update Android NDK compiler version (r9 required). Restore x86 and armeabi builds that I accidentally removed.