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

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