Merge "Desugar when javac version is 1.7"