Merge changes I449d903b,I31bb2339

* changes:
  Add a test for jarjar with Java 9 language features.
  Move Java9LanguageFeaturesTest into its own directory.