Vogar: Remove desugar completely am: 0b1290c387

Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/3381108

Change-Id: Icc1c73b2ccdccfc31082560d5ee93547bdc4c403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>