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

Change-Id: I0a748f294daddcae894cbe7d9c490b633ed295d1