Merge "Revert "Allow proto builds to pass in java proto params.""