Updated to new AndroidStudio version