Merge "Revert "Fix Android Studio setup for support lib""