Merge "test: Add desugar support to run-test"
am: 5c722df951

Change-Id: I56b0cf66c901b21630e67ff59c10a9db1a92d118