More updates to build process
Further changes to build process (blame Android Studio)