Merged pre android studio files into android studio project