Merge "Fix OldJarFileTest: move initialization to setUp()" am: 3f6031f995 am: efb6f01120
am: 1d99476c68

* commit '1d99476c68641ec7d9c97fe0040a9f5610a2a982':
  Fix OldJarFileTest: move initialization to setUp()