Misc scons fixes.
Clean up the Android NDK build process.

This removes a bunch of hacks in favor of doing things properly.  It is
now possible to build with the latest NDK, revision 10c.