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

Change-Id: I0be123c6338f495a0eaa9edd51aac5271a8afbfe