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

Change-Id: I4b90972b4b60e097e0b78fef1f85a9d42769c431