Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar" am: 67e182a0a1
am: d9074776c9

Change-Id: I75ef138192f82e91d1a3d27d47800af03fe1808b