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

* aosp/upstream-master:
  Uniquify bridge methods generated during lambda desugaring
  Allow to have several inputs and outputs
  Speed-up the search for desugared classes in case of many lambdas by limiting the search to the directory where we expect the file.

Bug: 36201257
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: Ifa6df92757bebd047da3430bbd84b2118dcd718e
tree: 0c0263f40a2f6a94f5558e455a8e40630841a1ae
  1. Android.mk
  2. copy.bara.sky
  3. java/
  4. manifest.txt