Merge "Add a desugar step between javac and proguard"