Merge "Fix OldJarFileTest: move initialization to setUp()"