Merge "Fix SDK build by packaging the new Ant rules files."