Merge "Fix test for renamed frameworks.jar"