Merge "Revert "Update D8 and R8 to 2.0.8-dev""