Android Cleanup

Started cleaning up Android files.