Rename instrumentTest dir to androidTest; Update gradle version