Merge "Fix intermediate src dir for framework.jar"