commit 1109791bea6e6265ad4e9d1bb59de8c6aa8c066b
author Ivan Gavrilovic <gavra@google.com> Fri May 19 14:14:25 2017 +0100
committer Ivan Gavrilovic <gavra@google.com> Fri May 19 14:15:00 2017 +0100
tree c2106c2f1919425d39b05b719efee4f7391f08c8
parent 11217a9366965bf30c52e9ee92c9da1e61aeb504
parent 8625fbb68021ef98bd7b7ae6df995fde1a24b23b

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

* aosp/upstream-master:
  Improve diagnostics. Report an error when we fail to register the lambda dump directory. This is achieved by checking InnerClassLambdaMetafactory.dumper's dumpDir.
  Refine assertion by providing more information. When the given path is NOT a directory, output its path.
  Fix Desugar duplicating path for dumped classes.
  Optimize the runtime library for try-with-resources, by reducing the granularity of locks. Now it uses a customized concurrent weak identity hash map.

Test: builds
Change-Id: I8c2231db2ca44066885360aba0296a1d3e6d83f2