Fixes build in AndroidStudio + updates dependencies