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

* aosp/upstream-master:
  Fix printing of options categories in CLI help
  fix issue with interfaces redefining (overriding) inherited default methods RELNOTES: none
  Use ASM to collection exception types, so that we can avoid using class loaders to resolve classes hierarchy to determine whether a type is an exception type.
  Option for try-with-resources runtime classes

Test: builds
Change-Id: Ifc92ac133d48fe8eaccb544f93354510117db11b
tree: 293694e1293dbc4326919e772e3ffb8722985924
  1. java/
  2. Android.mk
  3. copy.bara.sky
  4. manifest.txt