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

Change-Id: I08eb19b2cd53f547cb6c8c3f1f76b81099a77211