Merge "Pass min sdk version to dx and desugar" am: bbad7c3e1f
am: 4a4325d313

Change-Id: I9157bc2ce2f23371719b9731ee829529147580de