Merge "Add a desugar step between javac and proguard" am: 9e92c2fd18
am: e4381dcac2

Change-Id: I5c72358097629e3ffe597c517e86a38ffbf51d82