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

Change-Id: I4f94cd5f6cd8a94d26bac38bc021eb1959fc1287