Merge "Bump droiddriver version"