Merge "Revert "Enable R8 by default""