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

Change-Id: I7e64cac34e2859a1da7ec5799c30eeace1122ea2