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

Change-Id: I8818d5c79f0bc22d4b1f4eef94aa76d9af1dd3fa