Android

Some small changes for Android related CMake magic.