Merge remote-tracking branch 'aosp/upstream-master' into master

* aosp/upstream-master:
  roll-forward of "Delete temporary directory on exit"
  Add a flag to enable desugaring java.* classes by rewriting package names
  Revert "Delete temporary directory on exit"
  Delete temporary directory on exit

Test: builds
Change-Id: I85f4f1b29a83cf2cac602fa424693444ae545a2d
tree: 7a298b4ab84b6d5c170d03e92adf53fe96ce2b56
  1. java/
  2. Android.mk
  3. copy.bara.sky
  4. manifest.txt