Merge "test: Skip desugar with DESUGAR=false when running tests"
am: 8d80bba69c

Change-Id: Ie1d3dab7737775f7f5c136b544f85891c2dc8e19