Merge "Revert "test: Add desugar support to run-test""
am: fbc3fffc4a

Change-Id: I6e002cf784477972c671573471919a80ca49bdad