Merge "Revert back to using the default r8 jar for buildtools"