More Android Updates, migrated to android studio

No newline