fixes for recent android studio.