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

Change-Id: Ifc265f1d64f63b34872bec071691d54238af845a