Make sure we use the right packages and also switch to the android studio script instead of the plugin (seems to be more stable)