Also includes some whitespace/formatting changes due to the switch to Android Studio.
This uses a manual way to trigger the NDK build (the default with on-the-fly Android.mk files does not work for us).