Merge "Revert back to using the default r8 jar for buildtools" am: d19b1fea66 am: 0885f568ce am: 2a34fb7675 am: d61ae9e460

Change-Id: I118c9ad5561f3f10162a180193451d309d73154a