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

Change-Id: I91c44faaf7898507b15835b32b7860fb448671c2