CMake fixes for standard Android.mk configurations.
VTK fixes for Android cross compile.
Merge upstream.
Merge pull request #456 from chadrockey/android

Android fixes for taka-no-me's Android toolchain and exporting Android.mk files