Merge changes I0a1aa003,I000c3c22

* changes:
  Use dx or d8 from prebuilts/build-tools
  Desugar lambdas in javac unbundled builds