Merge "Revert "Revert "test: Add desugar support to run-test""" am: 4cf4e365a9 am: e06d73b11f am: 604e3c19e2
am: 61331a2087

Change-Id: I53afd5fd41fded2d598e0eb27ef5e58c4c4a6f42