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

Change-Id: Iaf38e92f9e55940aef8bfdf2e67fd851d315ab19