Merge "Desugar when javac version is 1.7"
am: ed44a54991

Change-Id: I71b868d277fbf81700cd85e45a1f852c90247120