Merge "Replace framework.jar with framework-minus-apex.jar"