update to Android studio and fixes for 4.x